Make closures in constructor initializers read type variables directly.

sdk/lib/_internal/compiler/implementation/ssa/builder.dart

Index: sdk/lib/_internal/compiler/implementation/ssa/builder.dart
diff --git a/sdk/lib/_internal/compiler/implementation/ssa/builder.dart b/sdk/lib/_internal/compiler/implementation/ssa/builder.dart
index a73f41c2fa0c759ad521fb37dd99ede95fef44e7..ab3d5038d3fe6eb95790e449824c47dbace95484 100644
--- a/sdk/lib/_internal/compiler/implementation/ssa/builder.dart
+++ b/sdk/lib/_internal/compiler/implementation/ssa/builder.dart
@@ -3276,6 +3276,14 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
     return pop();
   }
 
+  // TODO(karlklose): this is needed to avoid a bug where the resolved type is
+  // not stored on a type annotation in the closure translator. Remove when

[ngeoffray, 2013/07/12 12:09:25]

Not sure I understand this comment. What does it mean to be stored on a type
annotation? Isn't it the resolver that does this? How come the closure
translator does something that we have to rely on here, instead of doing the
same?

[karlklose, 2013/07/12 12:22:54]

The wording isn't the best, I agree. With storing a type on an annotation i mean
having an entry in the types map in the tree elements. I did not mean to say
that the closure translator stores a type but that it finds an annotation for
which no types has been stored (in the resolver).

[ngeoffray, 2013/07/12 12:27:39]

So that's a bug in the resolver?

+  // fixed.
+  bool hasDirectLocal(Element element) {
+    return !localsHandler.isAccessedDirectly(element) ||
+        localsHandler.directLocals[element] != null;
+  }
+
   /**
    * Helper to create an instruction that gets the value of a type variable.
    */
@@ -3288,10 +3296,10 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
       member = member.getOutermostEnclosingMemberOrTopLevel();
     }
     bool isInConstructorContext = member.isConstructor() ||
-        member.isGenerativeConstructorBody() ||
-        member.isField();
+        member.isGenerativeConstructorBody();
     if (isClosure) {
-      if (member.isFactoryConstructor()) {
+      if (member.isFactoryConstructor() ||
+          (isInConstructorContext && hasDirectLocal(type.element))) {
         // 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.
@@ -3299,8 +3307,7 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
       } else if (member.isFunction() ||
           member.isGetter() ||
           member.isSetter() ||
-          member.isConstructor() ||
-          member.isGenerativeConstructorBody()) {
+          isInConstructorContext) {
         // 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);
@@ -3309,7 +3316,7 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
         // The type variable is stored in a parameter of the method.
         return localsHandler.readLocal(type.element);
       }
-    } else if (isInConstructorContext) {
+    } else if (isInConstructorContext || member.isField()) {
       // The type variable is stored in a parameter of the method.
       return localsHandler.readLocal(type.element);
     } else if (member.isInstanceMember()) {