Version 0.8.10.8

dart/sdk/lib/_internal/compiler/implementation/resolution/members.dart

Index: dart/sdk/lib/_internal/compiler/implementation/resolution/members.dart
===================================================================
--- dart/sdk/lib/_internal/compiler/implementation/resolution/members.dart	(revision 30037)
+++ dart/sdk/lib/_internal/compiler/implementation/resolution/members.dart	(working copy)
@@ -3949,11 +3949,9 @@
       return;
     }
 
-    assert(mixinApplication.mixin == null);
-    Element mixin = resolveMixinFor(mixinApplication, mixinType);
+    assert(mixinApplication.mixinType == null);
+    mixinApplication.mixinType = resolveMixinFor(mixinApplication, mixinType);
 
-    mixinApplication.mixin = mixin;
-
     // Create forwarding constructors for constructor defined in the superclass
     // because they are now hidden by the mixin application.
     ClassElement superclass = supertype.element;
@@ -3966,8 +3964,8 @@
     calculateAllSupertypes(mixinApplication);
   }
 
-  ClassElement resolveMixinFor(MixinApplicationElement mixinApplication,
-                               DartType mixinType) {
+  InterfaceType resolveMixinFor(MixinApplicationElement mixinApplication,
+                                DartType mixinType) {
     ClassElement mixin = mixinType.element;
     mixin.ensureResolved(compiler);
 
@@ -3989,7 +3987,7 @@
       current = currentMixinApplication.mixin;
     }
     compiler.world.registerMixinUse(mixinApplication, mixin);
-    return mixin;
+    return mixinType;
   }
 
   DartType resolveType(TypeAnnotation node) {