Fix passing of type arguments in redirecting constructors.

sdk/lib/_internal/compiler/implementation/ssa/builder.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 ssa;
 
 /**
  * A special element for the extra parameter taken by intercepted
  * methods. We need to implement [TypedElement.type] because our
  * optimizers may look at its declared type.
@@ skipping 4783 matching lines @@
     closeAndGotoExit(new HThrow(exception, isRethrow: true));
   }
 
   visitReturn(ast.Return node) {
     if (identical(node.getBeginToken().stringValue, 'native')) {
       native.handleSsaNative(this, node.expression);
       return;
     }
     HInstruction value;
     if (node.isRedirectingFactoryBody) {
-      FunctionElement element = elements[node.expression].implementation;
-      FunctionElement function = sourceElement;
+      FunctionElement targetConstructor =
+          elements[node.expression].implementation;
+      FunctionElement redirectingConstructor = sourceElement;
       List<HInstruction> inputs = <HInstruction>[];
-      FunctionSignature calleeSignature = element.functionSignature;
-      FunctionSignature callerSignature = function.functionSignature;
-      callerSignature.forEachRequiredParameter((Element element) {
+      FunctionSignature targetSignature = targetConstructor.functionSignature;
+      FunctionSignature redirectingSignature =
+          redirectingConstructor.functionSignature;
+      redirectingSignature.forEachRequiredParameter((Element element) {
         inputs.add(localsHandler.readLocal(element));
       });
-      List<Element> calleeOptionals =
-          calleeSignature.orderedOptionalParameters;
-      List<Element> callerOptionals =
-          callerSignature.orderedOptionalParameters;
+      List<Element> targetOptionals =
+          targetSignature.orderedOptionalParameters;
+      List<Element> redirectingOptionals =
+          redirectingSignature.orderedOptionalParameters;
       int i = 0;
-      for (; i < callerOptionals.length; i++) {
-        inputs.add(localsHandler.readLocal(callerOptionals[i]));
+      for (; i < redirectingOptionals.length; i++) {
+        inputs.add(localsHandler.readLocal(redirectingOptionals[i]));
       }
-      for (; i < calleeOptionals.length; i++) {
-        inputs.add(handleConstantForOptionalParameter(calleeOptionals[i]));
+      for (; i < targetOptionals.length; i++) {
+        inputs.add(handleConstantForOptionalParameter(targetOptionals[i]));
       }
 
-      if (backend.classNeedsRti(element.getEnclosingClass())) {
-        ClassElement cls = function.getEnclosingClass();
-        Link<DartType> typeVariable = cls.typeVariables;
-        InterfaceType type = elements.getType(node.expression);
-        type.typeArguments.forEach((DartType argument) {
+      ClassElement targetClass = targetConstructor.getEnclosingClass();
+      if (backend.classNeedsRti(targetClass)) {
+        ClassElement cls = redirectingConstructor.getEnclosingClass();
+        InterfaceType targetType =
+            redirectingConstructor.computeTargetType(cls.thisType);
+        targetType.typeArguments.forEach((DartType argument) {
           inputs.add(analyzeTypeArgument(argument));
-          typeVariable = typeVariable.tail;
         });
-        assert(typeVariable.isEmpty);
       }
-      pushInvokeStatic(node, element, inputs);
+      pushInvokeStatic(node, targetConstructor, inputs);
       value = pop();
     } else if (node.expression == null) {
       value = graph.addConstantNull(compiler);
     } else {
       visit(node.expression);
       value = pop();
       value = potentiallyCheckType(value, returnType);
     }
 
     handleInTryStatement();
@@ skipping 1470 matching lines @@
     DartType unaliased = type.unalias(builder.compiler);
     if (unaliased is TypedefType) throw 'unable to unalias $type';
     unaliased.accept(this, builder);
   }
 
   void visitDynamicType(DynamicType type, SsaBuilder builder) {
     ClassElement cls = builder.compiler.findHelper('DynamicRuntimeType');
     builder.push(new HDynamicType(type, new TypeMask.exact(cls)));
   }
 }