| Index: tests/compiler/dart2js/serialization_test.dart
|
| diff --git a/tests/compiler/dart2js/serialization_test.dart b/tests/compiler/dart2js/serialization_test.dart
|
| index 9985399579ba7c25561d55f8cf8edf558904256b..a78244e58016f43b3a5de6afdb0dd9ad4a4c60be 100644
|
| --- a/tests/compiler/dart2js/serialization_test.dart
|
| +++ b/tests/compiler/dart2js/serialization_test.dart
|
| @@ -380,7 +380,8 @@ class ElementIdentityEquivalence extends BaseElementVisitor<dynamic, Element> {
|
| 'name',
|
| element1.name, element2.name);
|
| if (element1.enclosingClass != null || element2.enclosingClass != null) {
|
| - visit(element1.enclosingClass, element2.enclosingClass);
|
| + visit(element1.enclosingClass.declaration,
|
| + element2.enclosingClass.declaration);
|
| } else {
|
| visit(element1.library, element2.library);
|
| }
|
| @@ -523,21 +524,29 @@ class ElementPropertyEquivalence extends BaseElementVisitor<dynamic, Element> {
|
| void visitMembers(ScopeContainerElement element1,
|
| ScopeContainerElement element2) {
|
| Set<String> names = new Set<String>();
|
| - element1.forEachLocalMember((Element member) {
|
| + Iterable<Element> members1 = element1.isLibrary
|
| + ? LibrarySerializer.getMembers(element1)
|
| + : ClassSerializer.getMembers(element1);
|
| + Iterable<Element> members2 = element2.isLibrary
|
| + ? LibrarySerializer.getMembers(element2)
|
| + : ClassSerializer.getMembers(element2);
|
| + for (Element member in members1) {
|
| names.add(member.name);
|
| - });
|
| - element2.forEachLocalMember((Element member) {
|
| + }
|
| + for (Element member in members2) {
|
| names.add(member.name);
|
| - });
|
| + }
|
| + element1 = element1.implementation;
|
| + element2 = element2.implementation;
|
| for (String name in names) {
|
| Element member1 = element1.localLookup(name);
|
| Element member2 = element2.localLookup(name);
|
| if (member1 == null) {
|
| - print('Missing member for $member2');
|
| + print('Missing member for $member2 in\n ${members1.join('\n ')}');
|
| continue;
|
| }
|
| if (member2 == null) {
|
| - print('Missing member for $member1');
|
| + print('Missing member for $member1 in\n ${members2.join('\n ')}');
|
| continue;
|
| }
|
| visit(member1, member2);
|
|
|