Infer types of catpured variables and use the types in the SSA builder.

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 175 matching lines @@
                   this.callElement,
                   this.thisElement)
       : this.freeVariableMapping = new Map<Element, Element>(),
         this.capturedFieldMapping = new Map<Element, Element>(),
         this.capturingScopes = new Map<Node, ClosureScope>(),
         this.usedVariablesInTry = new Set<Element>(),
         this.parametersWithSentinel = new Map<Element, Element>();
 
   bool isClosure() => closureElement != null;
 
-  bool captures(Element element) => freeVariableMapping.containsKey(element);
+  bool isVariableCaptured(Element element) {
+    freeVariableMapping.containsKey(element);
+  }
 
-  bool mutates(Element element) {
+  bool isVariableBoxed(Element element) {
     Element copy = freeVariableMapping[element];
     return copy != null && !copy.isMember();
   }
 
   void forEachCapturedVariable(void f(Element element)) {
     freeVariableMapping.forEach((variable, _) {
       if (variable is BoxElement) return;
       f(variable);
     });
   }
+
+  void forEachBoxedVariable(void f(Element element)) {

[karlklose, 2013/03/05 09:57:24]

Is this function used?

[ngeoffray, 2013/03/05 10:18:45]

No, but I'd like to come up with some abstractions on top of the closure data.
Users of closure data are looking into its fields, and it does not help
readability.

+    freeVariableMapping.forEach((variable, copy) {
+      if (!isVariableBoxed(variable)) return;
+      f(variable);
+    });
+  }
+
+  void forEachNonBoxedCapturedVariable(void f(Element element)) {
+    freeVariableMapping.forEach((variable, copy) {
+      if (variable is BoxElement) return;
+      if (isVariableBoxed(variable)) return;
+      f(variable);
+    });
+  }
 }
 
 class ClosureTranslator extends Visitor {
   final Compiler compiler;
   final TreeElements elements;
   int closureFieldCounter = 0;
   int boxedFieldCounter = 0;
   bool inTryStatement = false;
   final Map<Node, ClosureClassMap> closureMappingCache;
 
@@ skipping 450 matching lines @@
   }
 
   visitTryStatement(TryStatement node) {
     // TODO(ngeoffray): implement finer grain state.
     bool oldInTryStatement = inTryStatement;
     inTryStatement = true;
     node.visitChildren(this);
     inTryStatement = oldInTryStatement;
   }
 }