Clean up code capturing variables explicitly.

runtime/vm/scopes.cc

 // 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.
 
 #include "vm/scopes.h"
 
 #include "vm/object.h"
 #include "vm/stack_frame.h"
 #include "vm/symbols.h"
 
@@ skipping 413 matching lines @@
   return NULL;
 }
 
 
 bool LocalScope::CaptureVariable(const String& name) {
   ASSERT(name.IsSymbol());
   LocalScope* current_scope = this;
   while (current_scope != NULL) {
     LocalVariable* var = current_scope->LocalLookupVariable(name);
     if (var != NULL) {
-      if (var->owner()->function_level() != function_level()) {
-        var->set_is_captured();
-      }
+      var->set_is_captured();
       // Insert aliases of the variable in intermediate scopes.
       LocalScope* intermediate_scope = this;
       while (intermediate_scope != current_scope) {
         intermediate_scope->variables_.Add(var);
         ASSERT(var->owner() != intermediate_scope);  // Item is an alias.
         intermediate_scope = intermediate_scope->parent();
       }
       return true;
     }
     current_scope = current_scope->parent();
@@ skipping 179 matching lines @@
   bool found = false;
   for (intptr_t i = 0; i < num_variables(); i++) {
     if ((VariableAt(i)->name().raw() == Symbols::StackTraceVar().raw()) ||
         (VariableAt(i)->name().raw() == Symbols::ExceptionVar().raw()) ||
         (VariableAt(i)->name().raw() == Symbols::SavedTryContextVar().raw())) {
       // Don't capture those variables because the VM expects them to be on the
       // stack.
       continue;
     }
     found = CaptureVariable(VariableAt(i)->name());
-    // Also manually set the variable as captured as CaptureVariable() does not
-    // handle capturing variables on the same scope level.
-    VariableAt(i)->set_is_captured();
     ASSERT(found);
   }
   if (sibling() != NULL) { sibling()->RecursivelyCaptureAllVariables(); }
   if (child() != NULL) { child()->RecursivelyCaptureAllVariables(); }
 }
 
 
 RawContextScope* LocalScope::CreateImplicitClosureScope(const Function& func) {
   static const intptr_t kNumCapturedVars = 1;
 
@@ skipping 40 matching lines @@
     return fixed_parameter_count - (index() - kParamEndSlotFromFp);
   } else {
     // Shift negative indexes so that the lowest one is 0 (they are still
     // non-positive).
     return fixed_parameter_count - (index() - kFirstLocalSlotFromFp);
   }
 }
 
 
 }  // namespace dart