Add type arguments to constants.

sdk/lib/_internal/compiler/implementation/elements/modelx.dart

 // Copyright (c) 2013, 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.
 
 library elements.modelx;
 
 import 'dart:collection' show LinkedHashMap;
 
 import 'elements.dart';
 import '../../compiler.dart' as api;
@@ skipping 1235 matching lines @@
         // TODO(ahe): This is expedient for now, but it should be
         // checked by the resolver.  Keeping http://dartbug.com/3970
         // open to track this.
         throw new SpannableAssertionFailure(
             target, 'redirecting factory leads to cycle');
       }
     }
     return target;
   }
 
+  InterfaceType computeTargetType(Compiler compiler,
+                                  InterfaceType newType) {
+    if (!isRedirectingFactory) return newType;
+    ClassElement targetClass = getEnclosingClass();
+    TreeElements treeElements =
+        compiler.enqueuer.resolution.getCachedElements(
+            declaration);
+    FunctionExpression functionNode = parseNode(compiler);
+    Return redirectionNode = functionNode.body;
+    return treeElements.getType(redirectionNode.expression)
+        .subst(newType.typeArguments, targetClass.typeVariables);
+  }
+
   /**
    * Applies a patch function to this function. The patch function's body
    * is used as replacement when parsing this function's body.
    * This method must not be called after the function has been parsed,
    * and it must be called at most once.
    */
   void setPatch(FunctionElement patchElement) {
     // Sanity checks. The caller must check these things before calling.
     assert(patch == null);
     this.patch = patchElement;
@@ skipping 922 matching lines @@
 
   MetadataAnnotation ensureResolved(Compiler compiler) {
     if (resolutionState == STATE_NOT_STARTED) {
       compiler.resolver.resolveMetadataAnnotation(this);
     }
     return this;
   }
 
   String toString() => 'MetadataAnnotation($value, $resolutionState)';
 }