Fix type variables in closures.

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 3237 matching lines @@
    * Helper to create an instruction that gets the value of a type variable.
    */
   HInstruction addTypeVariableReference(TypeVariableType type) {
     Element member = currentElement;
     bool isClosure = member.enclosingElement.isClosure();
     if (isClosure) {
       ClosureClassElement closureClass = member.enclosingElement;
       member = closureClass.methodElement;
       member = member.getOutermostEnclosingMemberOrTopLevel();
     }
-    if (isClosure && member.isFactoryConstructor()) {
-      // The type variable is used from a closure in a factory constructor.  The
-      // value of the type argument is stored as a local on the closure itself.
-      return localsHandler.readLocal(type.element);
-    } else if (member.isConstructor() ||
-               member.isGenerativeConstructorBody() ||
-               member.isField()) {
+    bool isInConstructorContext = member.isConstructor() ||
+        member.isGenerativeConstructorBody() ||
+        member.isField();
+    if (isClosure) {
+      if (member.isFactoryConstructor()) {
+        // The type variable is used from a closure in a factory constructor.
+        // The value of the type argument is stored as a local on the closure
+        // itself.
+        return localsHandler.readLocal(type.element);
+      } else if (member.isFunction() ||
+          member.isGetter() ||
+          member.isSetter() ||
+          member.isConstructor() ||
+          member.isGenerativeConstructorBody()) {
+        // The type variable is stored on the "enclosing object" and needs to be
+        // accessed using the this-reference in the closure.
+        return readTypeVariable(member.getEnclosingClass(), type.element);
+      } else {
+        assert(member.isField());
+        // The type variable is stored in a parameter of the method.
+        return localsHandler.readLocal(type.element);
+      }
+    } else if (isInConstructorContext) {
       // The type variable is stored in a parameter of the method.
       return localsHandler.readLocal(type.element);
     } else if (member.isInstanceMember()) {
       // The type variable is stored on the object.
       return readTypeVariable(member.getEnclosingClass(),
                               type.element);
     } else {
       // TODO(ngeoffray): Match the VM behavior and throw an
       // exception at runtime.
       compiler.cancel('Unimplemented unresolved type variable',
@@ skipping 2122 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;
   }
 }