More equivalence testing

pkg/compiler/lib/src/kernel/env.dart

 // Copyright (c) 2017, 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.kernel.env;
 
 import 'package:kernel/ast.dart' as ir;
 import 'package:kernel/clone.dart';
 import 'package:kernel/type_algebra.dart';
 
@@ skipping 90 matching lines @@
   void forEachClass(void f(ClassEnv cls)) {
     _ensureClassMap();
     _classMap.values.forEach(f);
   }
 
   void _ensureMemberMaps() {
     if (_memberMap == null) {
       _memberMap = <String, ir.Member>{};
       _setterMap = <String, ir.Member>{};
       for (ir.Member member in library.members) {
+        if (member.name.name.contains('#')) {
+          // Skip synthetic .dill members.
+          continue;
+        }
         if (member is ir.Procedure) {
           if (member.kind == ir.ProcedureKind.Setter) {
             _setterMap[member.name.name] = member;
           } else {
             _memberMap[member.name.name] = member;
           }
         } else if (member is ir.Field) {
           _memberMap[member.name.name] = member;
           if (member.isMutable) {
             _setterMap[member.name.name] = member;
@@ skipping 87 matching lines @@
   }
 
   void _ensureMaps() {
     if (_memberMap == null) {
       _memberMap = <String, ir.Member>{};
       _setterMap = <String, ir.Member>{};
       _constructorMap = <String, ir.Member>{};
 
       void addMembers(ir.Class c, {bool includeStatic}) {
         for (ir.Member member in c.members) {
+          if (member.name.name.contains('#')) {
+            // Skip synthetic .dill members.
+            continue;
+          }
           if (member is ir.Constructor ||
               member is ir.Procedure &&
                   member.kind == ir.ProcedureKind.Factory) {
             if (!includeStatic) continue;
             _constructorMap[member.name.name] = member;
           } else if (member is ir.Procedure) {
             if (!includeStatic && member.isStatic) continue;
             if (member.kind == ir.ProcedureKind.Setter) {
               _setterMap[member.name.name] = member;
             } else {
@@ skipping 202 matching lines @@
       }
     }
     return _constant;
   }
 
   @override
   FieldData copy() {
     return new FieldData(node);
   }
 }