Fix several element properties in serialization.

tests/compiler/dart2js/serialization/equivalence_test.dart

 // Copyright (c) 2015, 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;
 
 import 'dart:io';
 import '../memory_compiler.dart';
 import 'package:async_helper/async_helper.dart';
 import 'package:compiler/src/commandline_options.dart';
@@ skipping 117 matching lines @@
     LibraryElement library1, LibraryElement library2) {
   checkElementProperties(object1, object2, property, library1, library2);
 }
 
 /// Check the equivalence of [element1] and [element2] and their properties.
 ///
 /// Uses [object1], [object2] and [property] to provide context for failures.
 checkElementProperties(
     Object object1, object2, String property,
     Element element1, Element element2) {
+  currentCheck =
+      new Check(currentCheck, object1, object2, property, element1, element2);
   const ElementPropertyEquivalence().visit(element1, element2);
+  currentCheck = currentCheck.parent;
 }
 
 /// Checks the equivalence of [constructor1] and [constructor2].
 void constantConstructorEquivalence(ConstantConstructor constructor1,
                                     ConstantConstructor constructor2) {
   const ConstantConstructorEquivalence().visit(constructor1, constructor2);
 }
 
 /// Visitor that checks the equivalence of [ConstantConstructor]s.
 class ConstantConstructorEquivalence
@@ skipping 99 matching lines @@
     check(element1, element2, 'kind', element1.kind, element2.kind);
     element1.accept(this, element2);
     check(element1, element2, 'isSynthesized',
         element1.isSynthesized, element2.isSynthesized);
     check(element1, element2, 'isLocal',
         element1.isLocal, element2.isLocal);
     check(element1, element2, 'isFinal',
         element1.isFinal, element2.isFinal);
     check(element1, element2, 'isConst',
         element1.isConst, element2.isConst);
+    check(element1, element2, 'isAbstract',
+        element1.isAbstract, element2.isAbstract);
+    check(element1, element2, 'isStatic',
+        element1.isStatic, element2.isStatic);
+    check(element1, element2, 'isTopLevel',
+        element1.isTopLevel, element2.isTopLevel);
+    check(element1, element2, 'isClassMember',
+        element1.isClassMember, element2.isClassMember);
+    check(element1, element2, 'isInstanceMember',
+        element1.isInstanceMember, element2.isInstanceMember);
   }
 
   @override
   void visitElement(Element e, Element arg) {
     throw new UnsupportedError("Unsupported element $e");
   }
 
   @override
   void visitLibraryElement(LibraryElement element1, LibraryElement element2) {
     checkElementIdentities(null, null, null, element1, element2);
@@ skipping 85 matching lines @@
         String message =
             'Missing member for $member1 in\n ${members2.join('\n ')}';
         if (member1.isAbstractField) {
           // TODO(johnniwinther): Ensure abstract fields are handled correctly.
           //print(message);
           continue;
         } else {
           throw message;
         }
       }
+      currentCheck = new Check(currentCheck, element1, element1,
+          'member:$name', member1, member2);
       visit(member1, member2);
+      currentCheck = currentCheck.parent;
     }
   }
 
   @override
   void visitClassElement(ClassElement element1, ClassElement element2) {
     checkElementIdentities(null, null, null, element1, element2);
     check(element1, element2, 'name',
           element1.name, element2.name);
-    check(element1, element2, 'sourcePosition',
+    if (!element1.isUnnamedMixinApplication) {
+      check(element1, element2, 'sourcePosition',
           element1.sourcePosition, element2.sourcePosition);
+    } else {
+      check(element1, element2, 'sourcePosition.uri',
+          element1.sourcePosition.uri, element2.sourcePosition.uri);
+    }
     checkElementIdentities(
         element1, element2, 'library',
         element1.library, element2.library);
     checkElementIdentities(
         element1, element2, 'compilationUnit',
         element1.compilationUnit, element2.compilationUnit);
+    checkTypeLists(
+        element1, element2, 'typeVariables',
+        element1.typeVariables, element2.typeVariables);
+    checkTypes(
+        element1, element2, 'thisType',
+        element1.thisType, element2.thisType);
+    checkTypes(
+        element1, element2, 'rawType',
+        element1.rawType, element2.rawType);
     check(element1, element2, 'isObject',
         element1.isObject, element2.isObject);
     checkTypeLists(element1, element2, 'typeVariables',
         element1.typeVariables, element2.typeVariables);
     check(element1, element2, 'isAbstract',
         element1.isAbstract, element2.isAbstract);
     check(element1, element2, 'isUnnamedMixinApplication',
         element1.isUnnamedMixinApplication, element2.isUnnamedMixinApplication);
     check(element1, element2, 'isEnumClass',
         element1.isEnumClass, element2.isEnumClass);
@@ skipping 39 matching lines @@
     List<ConstructorElement> getConstructors(ClassElement cls) {
       return cls.implementation.constructors.map((c) => c.declaration).toList();
     }
 
     checkElementLists(
         element1, element2, 'constructors',
         getConstructors(element1),
         getConstructors(element2));
 
     visitMembers(element1, element2);
+
+    ClassElement superclass1 = element1.superclass;
+    ClassElement superclass2 = element2.superclass;
+    while (superclass1 != null && superclass1.isMixinApplication) {
+      checkElementProperties(element1, element2, 'supermixin',
+          superclass1, superclass2);
+      superclass1 = superclass1.superclass;
+      superclass2 = superclass2.superclass;
+    }
   }
 
   @override
   void visitFieldElement(FieldElement element1, FieldElement element2) {
     checkElementIdentities(null, null, null, element1, element2);
     check(element1, element2, 'name',
           element1.name, element2.name);
     check(element1, element2, 'sourcePosition',
           element1.sourcePosition, element2.sourcePosition);
     checkTypes(
@@ skipping 94 matching lines @@
   @override
   void visitConstructorElement(ConstructorElement element1,
                                ConstructorElement element2) {
     checkElementIdentities(null, null, null, element1, element2);
     checkElementIdentities(
         element1, element2, 'enclosingClass',
         element1.enclosingClass, element2.enclosingClass);
     check(
         element1, element2, 'name',
         element1.name, element2.name);
-    check(element1, element2, 'sourcePosition',
+    if (!element1.isSynthesized) {
+      check(element1, element2, 'sourcePosition',
           element1.sourcePosition, element2.sourcePosition);
+    } else {
+      check(element1, element2, 'sourcePosition.uri',
+          element1.sourcePosition.uri, element2.sourcePosition.uri);
+    }
     checkListEquivalence(
         element1, element2, 'parameters',
         element1.parameters, element2.parameters,
         checkElementProperties);
     checkTypes(
         element1, element2, 'type',
         element1.type, element2.type);
     check(element1, element2, 'isExternal',
           element1.isExternal, element2.isExternal);
     if (element1.isConst && !element1.isExternal) {
@@ skipping 136 matching lines @@
   void visitPrefixElement(PrefixElement element1, PrefixElement element2) {
     check(
         element1, element2, 'isDeferred',
         element1.isDeferred, element2.isDeferred);
     checkElementIdentities(
         element1, element2, 'importedLibrary',
         element1.deferredImport, element2.deferredImport);
     // TODO(johnniwinther): Check members.
   }
 }