Implement redirecting factories in mirrors.

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 3553 matching lines @@
     if (cls.isAbstract(compiler) && constructor.isGenerativeConstructor()) {
       generateAbstractClassInstantiationError(send, cls.name.slowToString());
       return;
     }
     if (backend.classNeedsRti(cls)) {
       Link<DartType> typeVariable = cls.typeVariables;
       type.typeArguments.forEach((DartType argument) {
         inputs.add(analyzeTypeArgument(argument));
         typeVariable = typeVariable.tail;
       });
-      // Also add null to non-provided type variables to call the
-      // constructor with the right number of arguments.
-      while (!typeVariable.isEmpty) {
-        inputs.add(graph.addConstantNull(compiler));
-        typeVariable = typeVariable.tail;
-      }
+      assert(typeVariable.isEmpty);
     }
 
     if (constructor.isFactoryConstructor() && !type.typeArguments.isEmpty) {
       compiler.enqueuer.codegen.registerFactoryWithTypeArguments(elements);
     }
     HType elementType = computeType(constructor);
     addInlinedInstantiation(expectedType);
     pushInvokeStatic(node, constructor, inputs, elementType);
     removeInlinedInstantiation(expectedType);
     HInstruction newInstance = stack.last;
@@ skipping 590 matching lines @@
     closeAndGotoExit(new HThrow(exception, isRethrow: true));
   }
 
   visitReturn(Return node) {
     if (identical(node.getBeginToken().stringValue, 'native')) {
       native.handleSsaNative(this, node.expression);
       return;
     }
     HInstruction value;
     if (node.isRedirectingFactoryBody) {
-      // TODO(ahe): This is only for reflection, and it is not correct yet.
-      value = graph.addConstantNull(compiler);
+      FunctionElement element = elements[node.expression];
+      FunctionElement function = currentElement;
+      List<HInstruction> inputs = <HInstruction>[];
+      FunctionSignature calleeSignature = element.functionSignature;
+      FunctionSignature callerSignature = function.functionSignature;
+      callerSignature.forEachRequiredParameter((Element element) {
+        inputs.add(localsHandler.readLocal(element));
+      });
+      List<Element> calleeOptionals =
+          calleeSignature.orderedOptionalParameters;
+      List<Element> callerOptionals =
+          callerSignature.orderedOptionalParameters;
+      int i = 0;
+      for (; i < callerOptionals.length; i++) {
+        inputs.add(localsHandler.readLocal(callerOptionals[i]));
+      }
+      for (; i < calleeOptionals.length; i++) {
+        inputs.add(handleConstantForOptionalParameter(calleeOptionals[i]));
+      }
+
+      if (backend.classNeedsRti(element.getEnclosingClass())) {
+        ClassElement cls = function.getEnclosingClass();
+        Link<DartType> typeVariable = cls.typeVariables;
+        DartType type = elements.getType(node.expression);
+        type.typeArguments.forEach((DartType argument) {
+          inputs.add(analyzeTypeArgument(argument));
+          typeVariable = typeVariable.tail;
+        });
+        assert(typeVariable.isEmpty);
+      }
+      pushInvokeStatic(node, element, inputs);
+      value = pop();
     } else if (node.expression == null) {
       value = graph.addConstantNull(compiler);
     } else {
       visit(node.expression);
       value = pop();
       value = potentiallyCheckType(value, returnType);
     }
 
     handleInTryStatement();
 
@@ skipping 1311 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;
   }
 }