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 3235 matching lines @@
       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()) {
-      // The type variable is stored in a parameter of the method.
-      return localsHandler.readLocal(type.element);
+      if (isClosure && !member.isField()) {
+        // The type variable is stored on the object and needs to be accessed

[ngeoffray, 2013/06/18 08:00:43]

which object? The real "this" object?

[karlklose, 2013/06/18 11:05:00]

Yes.

+        // using the this-reference in the closure.
+        return readTypeVariable(member.getEnclosingClass(),

[ngeoffray, 2013/06/18 08:00:43]

I would move this code in a if (isClosure) test line 3249. I think that would
read easier to understand what different scenarios can we be in.

[karlklose, 2013/06/18 11:05:00]

Done.

+            type.element);

[ngeoffray, 2013/06/18 08:00:43]

Fits in one line?

[karlklose, 2013/06/18 11:05:00]

Done.

+      } else {
+        // 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',
                       element: type.element);
     }
@@ skipping 2120 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;
   }
 }