Read type argument from local in constructor.

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 3148 matching lines @@
     }
   }
 
   /**
    * Generate code to extract the type arguments from the object, substitute
    * them as an instance of the type we are testing against (if necessary), and
    * extract the type argument by the index of the variable in the list of type
    * variables for that class.
    */
   HInstruction readTypeVariable(ClassElement cls,
                                 TypeVariableElement variable) {

[ngeoffray, 2013/03/12 13:40:49]

Add assert(currentElement.isInstanceMember()).

[karlklose, 2013/03/12 13:44:07]

Done.

     int index = RuntimeTypeInformation.getTypeVariableIndex(variable);
     String substitutionNameString = backend.namer.substitutionName(cls);
     HInstruction substitutionName = graph.addConstantString(
         new LiteralDartString(substitutionNameString), null, constantSystem);
     HInstruction target = localsHandler.readThis();
     HInstruction substitution = createForeign('#[#]', HType.UNKNOWN,
         <HInstruction>[target, substitutionName]);
     add(substitution);
     pushInvokeHelper3(backend.getGetRuntimeTypeArgument(),
                       target,
@@ skipping 242 matching lines @@
   }
 
   visitTypeReferenceSend(Send node) {
     Element element = elements[node];
     if (element.isClass() || element.isTypedef()) {
       // TODO(karlklose): add type representation
       ConstantHandler handler = compiler.constantHandler;
       Constant constant = handler.compileNodeWithDefinitions(node, elements);
       stack.add(graph.addConstant(constant));
     } else if (element.isTypeVariable()) {
-      HInstruction value = readTypeVariable(currentElement.getEnclosingClass(),
-                                            element);
+      HInstruction value =
+          addTypeVariableReference(element.computeType(compiler));
       pushInvokeHelper1(backend.getRuntimeTypeToString(),
                         value, HType.STRING);
       pushInvokeHelper1(backend.getCreateRuntimeType(),
                         pop(), HType.UNKNOWN);
     } else {
       internalError('unexpected element kind $element', node: node);
     }
     if (node.isCall) {
       // This send is of the form 'e(...)', where e is resolved to a type
       // reference. We create a regular closure call on the result of the type
@@ skipping 1665 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;
   }
 }