Move code for accessing captured variables into the IL.

runtime/vm/flow_graph_compiler_x64.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/globals.h"  // Needed here to get TARGET_ARCH_X64.
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/flow_graph_compiler.h"
 
 #include "lib/error.h"
@@ skipping 595 matching lines @@
   ASSERT(VerifyCallComputation(comp));
   EmitStaticCall(comp->token_index(),
                  comp->try_index(),
                  comp->function(),
                  comp->ArgumentCount(),
                  comp->argument_names());
 }
 
 
 void FlowGraphCompiler::VisitLoadLocal(LoadLocalComp* comp) {
-  if (comp->local().is_captured()) {
-    // The variable lives in the context.
-    intptr_t delta = comp->context_level() -
-                     comp->local().owner()->context_level();
-    ASSERT(delta >= 0);
-    Register base = CTX;
-    while (delta-- > 0) {
-      __ movq(RAX, FieldAddress(base, Context::parent_offset()));
-      base = RAX;
-    }
-    __ movq(RAX,
-            FieldAddress(base,
-                         Context::variable_offset(comp->local().index())));
-  } else {
-    // The variable lives in the current stack frame.
-    __ movq(RAX, Address(RBP, comp->local().index() * kWordSize));
-  }
+  __ movq(RAX, Address(RBP, comp->local().index() * kWordSize));
 }
 
 
 void FlowGraphCompiler::VisitStoreLocal(StoreLocalComp* comp) {
   LoadValue(RAX, comp->value());
-  if (comp->local().is_captured()) {
-    // The variable lives in the context.
-    Register scratch = R10;
-    intptr_t delta = comp->context_level() -
-                     comp->local().owner()->context_level();
-    ASSERT(delta >= 0);
-    Register base = CTX;
-    while (delta-- > 0) {
-      __ movq(scratch, FieldAddress(base, Context::parent_offset()));
-      base = scratch;
-    }
-    __ StoreIntoObject(
-        base,
-        FieldAddress(base, Context::variable_offset(comp->local().index())),
-        RAX);
-  } else {
-    // The variable lives in the current stack frame.
-    __ movq(Address(RBP, comp->local().index() * kWordSize), RAX);
-  }
+  __ movq(Address(RBP, comp->local().index() * kWordSize), RAX);
 }
 
 
 void FlowGraphCompiler::VisitNativeCall(NativeCallComp* comp) {
   // Push the result place holder initialized to NULL.
   __ PushObject(Object::ZoneHandle());
   // Pass a pointer to the first argument in RAX.
   if (!comp->has_optional_parameters()) {
     __ leaq(RAX, Address(RBP, (1 + comp->argument_count()) * kWordSize));
   } else {
@@ skipping 272 matching lines @@
   if (cls.HasTypeArguments()) {
     __ popq(RCX);  // Discard type arguments.
   }
   if (function.IsImplicitInstanceClosureFunction()) {
     __ popq(RCX);  // Discard receiver.
   }
 }
 
 
 void FlowGraphCompiler::VisitNativeLoadField(NativeLoadFieldComp* comp) {
-  __ popq(RAX);
+  LoadValue(RAX, comp->value());
   __ movq(RAX, FieldAddress(RAX, comp->offset_in_bytes()));
 }
 
 
+void FlowGraphCompiler::VisitNativeStoreField(NativeStoreFieldComp* comp) {
+  LoadValue(RBX, comp->dest());
+  LoadValue(RAX, comp->value());
+  __ StoreIntoObject(RBX, FieldAddress(RBX, comp->offset_in_bytes()), RAX);
+}
+
+
 void FlowGraphCompiler::VisitInstantiateTypeArguments(
     InstantiateTypeArgumentsComp* comp) {
   __ popq(RAX);  // Instantiator.
 
   // RAX is the instantiator AbstractTypeArguments object (or null).
   // If the instantiator is null and if the type argument vector
   // instantiated from null becomes a vector of Dynamic, then use null as
   // the type arguments.
   Label type_arguments_instantiated;
   const intptr_t len = comp->type_arguments().Length();
@@ skipping 750 matching lines @@
   ASSERT(exception_handlers_list_ != NULL);
   const ExceptionHandlers& handlers = ExceptionHandlers::Handle(
       exception_handlers_list_->FinalizeExceptionHandlers(code.EntryPoint()));
   code.set_exception_handlers(handlers);
 }
 
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64