Version 1.1.0-dev.5.9

dart/sdk/lib/_internal/compiler/implementation/typechecker.dart

 // Copyright (c) 2012, 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.
 
 part of dart2js;
 
 class TypeCheckerTask extends CompilerTask {
   TypeCheckerTask(Compiler compiler) : super(compiler);
   String get name => "Type checker";
 
@@ skipping 1316 matching lines @@
   }
 
   DartType visitLiteralSymbol(LiteralSymbol node) {
     return compiler.symbolClass.computeType(compiler);
   }
 
   DartType computeConstructorType(Element constructor, DartType type) {
     if (Elements.isUnresolved(constructor)) return types.dynamicType;
     DartType constructorType = constructor.computeType(compiler);
     if (identical(type.kind, TypeKind.INTERFACE)) {
-      InterfaceType interfaceType = type;
-      constructorType = constructorType.subst(
-          interfaceType.typeArguments,
-          interfaceType.element.typeVariables);
+      if (constructor.isSynthesized) {
+        // TODO(johnniwinther): Remove this when synthesized constructors handle
+        // type variables correctly.
+        InterfaceType interfaceType = type;
+        ClassElement receiverElement = interfaceType.element;
+        while (receiverElement.isMixinApplication) {
+          receiverElement = receiverElement.supertype.element;
+        }
+        constructorType = constructorType.substByContext(
+            interfaceType.asInstanceOf(receiverElement));
+      } else {
+        constructorType = constructorType.substByContext(type);
+      }
     }
     return constructorType;
   }
 
   DartType visitNewExpression(NewExpression node) {
     Element element = elements[node.send];
     if (Elements.isUnresolved(element)) return types.dynamicType;
 
     checkPrivateAccess(node, element, element.name);
 
@@ skipping 299 matching lines @@
   visitTypedef(Typedef node) {
     // Do not typecheck [Typedef] nodes.
   }
 
   visitNode(Node node) {
     compiler.internalError(
         'Unexpected node ${node.getObjectDescription()} in the type checker.',
         node: node);
   }
 }