Re-apply with a few fixes http://codereview.chromium.org/10913081/: Fix resolution of type paramete…

lib/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.
 
 class Interceptors {
   Compiler compiler;
   Interceptors(Compiler this.compiler);
 
   SourceString mapOperatorToMethodName(Operator op) {
     String name = op.source.stringValue;
@@ skipping 2536 matching lines @@
       target = new HInvokeSuper(inputs);
       add(target);
       inputs = <HInstruction>[target];
       addDynamicSendArgumentsToList(node, inputs);
       push(new HInvokeClosure(selector, inputs));
     }
   }
 
   HInstruction analyzeTypeArgument(DartType argument, Node currentNode) {
     if (argument.element.isTypeVariable()) {
-      if (work.element.isFactoryConstructor()
-          || work.element.isGenerativeConstructor()) {
+      Element member = work.element;
+      if (member.enclosingElement.isClosure()) {
+        member = (member.enclosingElement as ClosureClassElement).methodElement;
+        member = member.getOutermostEnclosingMemberOrTopLevel();
+      }
+      if (member.isFactoryConstructor()) {
         // The type variable is stored in a parameter of the
         // factory.
         return localsHandler.readLocal(argument.element);
-      } else if (work.element.isInstanceMember()) {
+      } else if (member.isInstanceMember()
+                 || member.isGenerativeConstructor()) {
         // The type variable is stored in [this].
         pushInvokeHelper1(interceptors.getGetRuntimeTypeInfo(),
                           localsHandler.readThis());
         HInstruction typeInfo = pop();
         HInstruction foreign = new HForeign(
             new LiteralDartString('#.$argument'),
             new LiteralDartString('String'),
             <HInstruction>[typeInfo]);
         add(foreign);
         return foreign;
@@ skipping 1459 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;
   }
 }