Make closures in constructor initializers read type variables directly.

sdk/lib/_internal/compiler/implementation/closure.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.
 
 library closureToClassMapper;
 
 import "elements/elements.dart";
 import "dart2jslib.dart";
 import "dart_types.dart";
 import "scanner/scannerlib.dart" show Token;
@@ skipping 476 matching lines @@
       }
     }
   }
 
   visitIdentifier(Identifier node) {
     if (node.isThis()) {
       registerNeedsThis();
     } else {
       Element element = elements[node];
       if (element != null && element.kind == ElementKind.TYPE_VARIABLE) {
-        registerNeedsThis();
+        if (outermostElement.isConstructor()) {
+          useLocal(element);
+        } else {
+          registerNeedsThis();
+        }
       }
     }
     node.visitChildren(this);
   }
 
   visitSend(Send node) {
     Element element = elements[node];
     if (Elements.isLocal(element)) {
       useLocal(element);
+    } else if (element != null && element.isTypeVariable()) {
+      TypeVariableElement variable = element;
+      analyzeType(variable.type);
     } else if (node.receiver == null &&
                Elements.isInstanceSend(node, elements)) {
       registerNeedsThis();
     } else if (node.isSuperCall) {
       registerNeedsThis();
     } else if (node.isTypeTest || node.isTypeCast) {
       TypeAnnotation annotation = node.typeAnnotationFromIsCheckOrCast;
       DartType type = elements.getType(annotation);
-      if (type != null && type.containsTypeVariables) {
-        registerNeedsThis();
-      }
+      analyzeType(type);
     } else if (node.isTypeTest) {
       DartType type = elements.getType(node.typeAnnotationFromIsCheckOrCast);
       analyzeType(type);
     } else if (node.isTypeCast) {
       DartType type = elements.getType(node.arguments.head);
       analyzeType(type);
     }
     node.visitChildren(this);
   }
 
@@ skipping 10 matching lines @@
   }
 
   visitNewExpression(NewExpression node) {
     DartType type = elements.getType(node);
     analyzeType(type);
     node.visitChildren(this);
   }
 
   void analyzeTypeVariables(DartType type) {
     type.forEachTypeVariable((TypeVariableType typeVariable) {
-      useLocal(typeVariable.element);
       // Field initializers are inlined and access the type variable as
       // normal parameters.
-      if (!outermostElement.isField()) {
+      if (!outermostElement.isField() &&
+          !outermostElement.isConstructor()) {
         registerNeedsThis();
+      } else {
+        useLocal(typeVariable.element);
       }
     });
   }
 
   void analyzeType(DartType type) {
     // TODO(johnniwinther): Find out why this can be null.
     if (type == null) return;
     if (outermostElement.isMember() &&
         compiler.backend.classNeedsRti(outermostElement.getEnclosingClass())) {
       if (outermostElement.isConstructor() ||
@@ skipping 237 matching lines @@
   }
 
   visitTryStatement(TryStatement node) {
     // TODO(ngeoffray): implement finer grain state.
     bool oldInTryStatement = inTryStatement;
     inTryStatement = true;
     node.visitChildren(this);
     inTryStatement = oldInTryStatement;
   }
 }