dart2js cps: Change how type variables are accessed in constructors.

pkg/compiler/lib/src/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 'constants/expressions.dart';
 import 'dart2jslib.dart';
 import 'dart_types.dart';
 import 'elements/elements.dart';
@@ skipping 723 matching lines @@
       }
     }
   }
 
   visitIdentifier(Identifier node) {
     if (node.isThis()) {
       registerNeedsThis();
     } else {
       Element element = elements[node];
       if (element != null && element.isTypeVariable) {
-        if (outermostElement.isConstructor) {
+        if (outermostElement.isConstructor ||
+            outermostElement.isField) {
           TypeVariableElement typeVariable = element;
           useTypeVariableAsLocal(typeVariable.type);
         } else {
           registerNeedsThis();
         }
       }
     }
     node.visitChildren(this);
   }
 
@@ skipping 319 matching lines @@
   }
 
   visitTryStatement(TryStatement node) {
     // TODO(ngeoffray): implement finer grain state.
     bool oldInTryStatement = inTryStatement;
     inTryStatement = true;
     node.visitChildren(this);
     inTryStatement = oldInTryStatement;
   }
 
+  visitCatchBlock(CatchBlock node) {
+    if (node.type != null) {
+      // The "on T" clause may contain type variables.
+      analyzeType(elements.getType(node.type));
+    }
+    if (node.formals != null) node.formals.visitChildren(this);

[karlklose, 2015/05/28 08:12:19]

Use {}.

[asgerf, 2015/05/28 09:34:21]

Done.

+    node.block.accept(this);
+  }
+
   visitAsyncForIn(AsyncForIn node) {
     // An `await for` loop is enclosed in an implicit try-finally.
     bool oldInTryStatement = inTryStatement;
     inTryStatement = true;
     visitLoop(node);
     inTryStatement = oldInTryStatement;
   }
 }
 
 /// A type variable as a local variable.
 class TypeVariableLocal implements Local {
   final TypeVariableType typeVariable;
   final ExecutableElement executableContext;
 
   TypeVariableLocal(this.typeVariable, this.executableContext);
 
   String get name => typeVariable.name;
 
   int get hashCode => typeVariable.hashCode;
 
   bool operator ==(other) {
     if (other is! TypeVariableLocal) return false;
     return typeVariable == other.typeVariable;
   }
 }