Add type arguments to constants.

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 3362 matching lines @@
       assert(invariant(send, constructor != null,
                        message: 'Constructor Symbol.validated is missing'));
       selector = compiler.symbolValidatedConstructorSelector;
       assert(invariant(send, selector != null,
                        message: 'Constructor Symbol.validated is missing'));
     }
 
     bool isRedirected = functionElement.isRedirectingFactory;
     DartType expectedType = type;
     if (isRedirected) {
-      FunctionExpression functionNode = functionElement.parseNode(compiler);
-      if (functionNode.isRedirectingFactory) {
-        // Lookup the type used in the redirection.
-        Return redirectionNode = functionNode.body;
-        TreeElements treeElements =
-            compiler.enqueuer.resolution.getCachedElements(
-                functionElement.declaration);
-        ClassElement targetClass = functionElement.getEnclosingClass();
-        type = treeElements.getType(redirectionNode.expression)
-            .subst(type.typeArguments, targetClass.typeVariables);
-      }
-      functionElement = functionElement.redirectionTarget;
+      type = functionElement.computeTargetType(compiler, type);
     }
 
     var inputs = <HInstruction>[];
     // TODO(5347): Try to avoid the need for calling [implementation] before
     // calling [addStaticSendArgumentsToList].
     bool succeeded = addStaticSendArgumentsToList(selector, send.arguments,
                                                   constructor.implementation,
                                                   inputs);
     if (!succeeded) {
       generateWrongArgumentCountError(send, constructor, send.arguments);
@@ skipping 234 matching lines @@
       ErroneousElement error = element;
       if (error.messageKind == MessageKind.CANNOT_FIND_CONSTRUCTOR) {
         generateThrowNoSuchMethod(node.send,
                                   getTargetName(error, 'constructor'),
                                   argumentNodes: node.send.arguments);
       } else {
         Message message = error.messageKind.message(error.messageArguments);
         generateRuntimeError(node.send, message.toString());
       }
     } else if (node.isConst()) {
-      // TODO(karlklose): add type representation
       ConstantHandler handler = compiler.constantHandler;
       Constant constant = handler.compileNodeWithDefinitions(node, elements);
       stack.add(graph.addConstant(constant, compiler));
+      if (constant is ConstructedConstant) {
+        ConstructedConstant constructed = constant;
+        compiler.enqueuer.codegen.registerInstantiatedType(constructed.type,

[ngeoffray, 2013/06/17 09:15:03]

Isn't this already done by the constant_handler?

+                                                           elements);
+      }
       if (isSymbolConstructor) {
         ConstructedConstant symbol = constant;
         StringConstant stringConstant = symbol.fields.single;
         String nameString = stringConstant.toDartString().slowToString();
         compiler.enqueuer.codegen.registerConstSymbol(nameString, elements);
       }
     } else {
       DartType type = elements.getType(node);
       if (compiler.enableTypeAssertions && type.isMalformed) {
         String reasons = Types.fetchReasonsFromMalformedType(type);
@@ skipping 1717 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;
   }
 }