Fix KernelEquivalence.entityEquivalence for equi-named instance/top-level members

tests/compiler/dart2js/serialization/test_helper.dart

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library dart2js.serialization_test_helper;
 
 import 'dart:collection';
 import 'package:compiler/src/common/resolution.dart';
 import 'package:compiler/src/constants/expressions.dart';
 import 'package:compiler/src/constants/values.dart';
@@ skipping 703 matching lines @@
         }
         return false;
       case ElementKind.LIBRARY:
         if (b is KLibrary) {
           LibraryElement libraryA = a;
           return libraryA.canonicalUri == b.canonicalUri;
         }
         return false;
       case ElementKind.FUNCTION:
         if (b is KMethod) {
-          if (!strategy.test(a, b, 'name', a.name, b.name)) return false;
-          if (b.enclosingClass != null) {
-            return strategy.testElements(
-                a, b, 'enclosingClass', a.enclosingClass, b.enclosingClass);
-          } else {
-            return strategy.testElements(
-                a, b, 'library', a.library, testing.getLibraryForFunction(b));
-          }
+          return strategy.test(a, b, 'name', a.name, b.name) &&
+              strategy.testElements(
+                  a, b, 'enclosingClass', a.enclosingClass, b.enclosingClass) &&
+              strategy.testElements(a, b, 'library', a.library, b.library);
         } else if (b is KLocalFunction) {
           LocalFunctionElement aLocalFunction = a;
           return strategy.test(a, b, 'name', a.name, b.name ?? '') &&
               strategy.testElements(a, b, 'executableContext',
                   aLocalFunction.executableContext, b.executableContext) &&
               strategy.testElements(a, b, 'memberContext',
                   aLocalFunction.memberContext, b.memberContext);
         }
         return false;
       case ElementKind.GETTER:
         if (b is KGetter) {
-          if (!strategy.test(a, b, 'name', a.name, b.name)) return false;
-          if (b.enclosingClass != null) {
-            return strategy.testElements(
-                a, b, 'enclosingClass', a.enclosingClass, b.enclosingClass);
-          } else {
-            return strategy.testElements(
-                a, b, 'library', a.library, testing.getLibraryForFunction(b));
-          }
+          return strategy.test(a, b, 'name', a.name, b.name) &&
+              strategy.testElements(
+                  a, b, 'enclosingClass', a.enclosingClass, b.enclosingClass) &&
+              strategy.testElements(a, b, 'library', a.library, b.library);
         }
         return false;
       case ElementKind.SETTER:
         if (b is KSetter) {
-          if (!strategy.test(a, b, 'name', a.name, b.name)) return false;
-          if (b.enclosingClass != null) {
-            return strategy.testElements(
-                a, b, 'enclosingClass', a.enclosingClass, b.enclosingClass);
-          } else {
-            return strategy.testElements(
-                a, b, 'library', a.library, testing.getLibraryForFunction(b));
-          }
+          return strategy.test(a, b, 'name', a.name, b.name) &&
+              strategy.testElements(
+                  a, b, 'enclosingClass', a.enclosingClass, b.enclosingClass) &&
+              strategy.testElements(a, b, 'library', a.library, b.library);
         }
         return false;
       case ElementKind.FIELD:
         if (b is KField) {
-          if (!strategy.test(a, b, 'name', a.name, b.name)) return false;
-          if (b.enclosingClass != null) {
-            return strategy.testElements(
-                a, b, 'enclosingClass', a.enclosingClass, b.enclosingClass);
-          } else {
-            return strategy.testElements(
-                a, b, 'library', a.library, testing.getLibraryForField(b));
-          }
+          return strategy.test(a, b, 'name', a.name, b.name) &&
+              strategy.testElements(
+                  a, b, 'enclosingClass', a.enclosingClass, b.enclosingClass) &&
+              strategy.testElements(a, b, 'library', a.library, b.library);
         }
         return false;
       case ElementKind.TYPE_VARIABLE:
         if (b is KTypeVariable) {
           TypeVariableElement aElement = a;
           return strategy.test(a, b, 'index', aElement.index, b.index) &&
               strategy.testElements(a, b, 'typeDeclaration',
                   aElement.typeDeclaration, b.typeDeclaration);
         }
         return false;
@@ skipping 40 matching lines @@
               strategy.testTypeLists(a, b, 'namedParameterTypes',
                   aType.namedParameterTypes, b.namedParameterTypes);
         }
         return false;
       default:
         throw new UnsupportedError('Unsupported equivalence: '
             '$a (${a.runtimeType}) vs $b (${b.runtimeType})');
     }
   }
 }