Support type variables on redirecting factory 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 override [Element.computeType] because our
  * optimizers may look at its declared type.
@@ skipping 3213 matching lines @@
       } else {
         return HType.UNKNOWN;
       }
     }
 
     Element constructor = elements[node];
     Selector selector = elements.getSelector(node);
     if (compiler.enqueuer.resolution.getCachedElements(constructor) == null) {
       compiler.internalError("Unresolved element: $constructor", node: node);
     }
+
+    // Compute the right target and type for redirecting generative and

[ngeoffray, 2013/02/18 09:44:28]

What's a redirecting generative constructor?

[karlklose, 2013/02/19 13:20:27]

One that uses this(...), but they never actually end here, the comment was
wrong. Removed it.

+    // factory constructors.
     FunctionElement functionElement = constructor;
-    constructor = functionElement.redirectionTarget;
+    if (functionElement.redirectionTarget != functionElement) {

[ngeoffray, 2013/02/18 09:44:28]

Shouldn't you get the redirectionTarget until it's null?

[karlklose, 2013/02/19 13:20:27]

Yes. It does not matter currently, because we bail out for multiple
redirections.

+      FunctionExpression functionNode = constructor.parseNode(compiler);
+      if (functionNode.isRedirectingFactory) {
+        // Lookup the type expression used in the body and substitute the type
+        // variables with the call's type arguments in it.
+        Return redirectionNode = functionNode.body;
+        TreeElements treeElements =
+            compiler.enqueuer.resolution.getCachedElements(
+                constructor.declaration);
+        ClassElement targetClass = constructor.getEnclosingClass();
+        DartType targetType = treeElements.getType(redirectionNode.expression);
+        Link<DartType> typeVariables = targetClass.typeVariables;
+        Link<DartType> typeArguments = type.typeArguments;
+        type = targetType.subst(typeArguments, typeVariables);
+      }
+      constructor = functionElement.redirectionTarget;
+    }
+
+    // TODO(karlklose): move this type registration to the codegen.
+    compiler.codegenWorld.instantiatedTypes.add(type);
+
     // TODO(5346): Try to avoid the need for calling [declaration] before
     // creating an [HStatic].
     HInstruction target = new HStatic(constructor.declaration);
     add(target);
     var inputs = <HInstruction>[];
     inputs.add(target);
     // TODO(5347): Try to avoid the need for calling [implementation] before
     // calling [addStaticSendArgumentsToList].
     bool succeeded = addStaticSendArgumentsToList(selector, node.arguments,
                                                   constructor.implementation,
@@ skipping 238 matching lines @@
       Constant constant = handler.compileNodeWithDefinitions(node, elements);
       stack.add(graph.addConstant(constant));
     } else {
       DartType type = elements.getType(node);
       if (compiler.enableTypeAssertions && type.isMalformed) {
         String reasons = Types.fetchReasonsFromMalformedType(type);
         // TODO(johnniwinther): Change to resemble type errors from bounds check
         // on type arguments.
         generateRuntimeError(node, '$type is malformed: $reasons');
       } else {
-        // TODO(karlklose): move this type registration to the codegen.
-        compiler.codegenWorld.instantiatedTypes.add(type);
         visitNewSend(node.send, type);
       }
     }
   }
 
   HInvokeDynamicMethod buildInvokeDynamic(Node node,
                                           Selector selector,
                                           HInstruction receiver,
                                           List<HInstruction> arguments) {
     Set<ClassElement> interceptedClasses = getInterceptedClassesOn(selector);
@@ skipping 1445 matching lines @@
           new HSubGraphBlockInformation(elseBranch.graph));
 
     HBasicBlock conditionStartBlock = conditionBranch.block;
     conditionStartBlock.setBlockFlow(info, joinBlock);
     SubGraph conditionGraph = conditionBranch.graph;
     HIf branch = conditionGraph.end.last;
     assert(branch is HIf);
     branch.blockInformation = conditionStartBlock.blockFlow;
   }
 }