Fix bug in the closure methods, where iterating over the boxed variable did not return the variable…

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 229 matching lines @@
 
   // Maps scopes ([Loop] and [FunctionExpression] nodes) to their
   // [ClosureScope] which contains their box and the
   // captured variables that are stored in the box.
   // This map will be empty if the method/closure of this [ClosureData] does not
   // contain any nested closure.
   final Map<Node, ClosureScope> capturingScopes;
 
   final Set<Element> usedVariablesInTry;
 
-  // A map from the parameter element to the variable element that
-  // holds the sentinel check.
-  final Map<Element, Element> parametersWithSentinel;
-
   ClosureClassMap(this.closureElement,
                   this.closureClassElement,
                   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>();
+        this.usedVariablesInTry = new Set<Element>();
 
   bool isClosure() => closureElement != null;
 
   bool isVariableCaptured(Element element) {
-    return freeVariableMapping.containsKey(element);
+    return freeVariableMapping.containsKey(element)
+        || capturingScopesBox(element);
+  }
+
+  bool capturingScopesBox(Element element) {
+    return capturingScopes.values.any((scope) {
+      return scope.boxedLoopVariables.contains(element);
+    });
   }
 
   bool isVariableBoxed(Element element) {
     Element copy = freeVariableMapping[element];
-    return copy != null && !copy.isMember();
+    if (copy != null && !copy.isMember()) return true;
+    return capturingScopesBox(element);
   }
 
   void forEachCapturedVariable(void f(Element local, Element field)) {
     freeVariableMapping.forEach((variable, copy) {
       if (variable is BoxElement) return;
       f(variable, copy);
     });
+    capturingScopes.values.forEach((scope) {
+      scope.capturedVariableMapping.forEach(f);
+    });
   }
 
   void forEachBoxedVariable(void f(Element local, Element field)) {
     freeVariableMapping.forEach((variable, copy) {
       if (!isVariableBoxed(variable)) return;
       f(variable, copy);
     });
+    capturingScopes.values.forEach((scope) {
+      scope.capturedVariableMapping.forEach(f);
+    });
   }
 
   void forEachNonBoxedCapturedVariable(void f(Element local, Element field)) {
     freeVariableMapping.forEach((variable, copy) {
       if (variable is BoxElement) return;
       if (isVariableBoxed(variable)) return;
       f(variable, copy);
     });
   }
 }
@@ skipping 531 matching lines @@
   }
 
   visitTryStatement(TryStatement node) {
     // TODO(ngeoffray): implement finer grain state.
     bool oldInTryStatement = inTryStatement;
     inTryStatement = true;
     node.visitChildren(this);
     inTryStatement = oldInTryStatement;
   }
 }