Version 1.1.0-dev.5.9

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

Index: dart/sdk/lib/_internal/compiler/implementation/elements/modelx.dart
===================================================================
--- dart/sdk/lib/_internal/compiler/implementation/elements/modelx.dart	(revision 31731)
+++ dart/sdk/lib/_internal/compiler/implementation/elements/modelx.dart	(working copy)
@@ -1518,8 +1518,7 @@
     assert(invariant(this, redirectionTargetType != null,
         message: 'Redirection target type has not yet been computed for '
                  '$this.'));
-    return redirectionTargetType.subst(newType.typeArguments,
-                                       newType.element.typeVariables);
+    return redirectionTargetType.substByContext(newType);
   }
 
   /**
@@ -1671,6 +1670,8 @@
       return functionSignature = compiler.objectClass.localLookup('')
           .computeSignature(compiler);
     }
+    // TODO(johnniwinther): Ensure that the function signature (and with it the
+    // function type) substitutes type variables correctly.
     return functionSignature = superMember.computeSignature(compiler);
   }