- Rename NativeLoadField/NativeStoreField to LoadVMField/StoreVMField.

runtime/vm/flow_graph_builder.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/flow_graph_builder.h"
 
 #include "vm/ast_printer.h"
 #include "vm/bit_vector.h"
 #include "vm/code_descriptors.h"
 #include "vm/dart_entry.h"
@@ skipping 139 matching lines @@
 Computation* EffectGraphVisitor::BuildStoreLocal(
     const LocalVariable& local, Value* value) {
   if (local.is_captured()) {
     intptr_t delta = owner()->context_level() -
                      local.owner()->context_level();
     ASSERT(delta >= 0);
     BindInstr* context = new BindInstr(new CurrentContextComp());
     AddInstruction(context);
     Value* context_value = new UseVal(context);
     while (delta-- > 0) {
-      BindInstr* load = new BindInstr(new NativeLoadFieldComp(
+      BindInstr* load = new BindInstr(new LoadVMFieldComp(
           context_value, Context::parent_offset(), Type::ZoneHandle()));
       AddInstruction(load);
       context_value = new UseVal(load);
     }
-    Computation* store = new NativeStoreFieldComp(
+    Computation* store = new StoreVMFieldComp(

[Florian Schneider, 2012/05/24 01:15:47]

return new StoreFieldComp(

[Florian Schneider, 2012/05/24 01:16:32]

I mean of course: 

return new StoreVMFieldComp(

[Ivan Posva, 2012/05/29 17:35:04]

Done.

         context_value,
         Context::variable_offset(local.index()),
         value,
         local.type());
     return store;
   } else {
     return new StoreLocalComp(local, value, owner()->context_level());
   }
 }
 
 
 Computation* EffectGraphVisitor::BuildLoadLocal(const LocalVariable& local) {
   if (local.is_captured()) {
     intptr_t delta = owner()->context_level() -
                      local.owner()->context_level();
     ASSERT(delta >= 0);
     BindInstr* context = new BindInstr(new CurrentContextComp());
     AddInstruction(context);
     Value* context_value = new UseVal(context);
     while (delta-- > 0) {
-      BindInstr* load = new BindInstr(new NativeLoadFieldComp(
+      BindInstr* load = new BindInstr(new LoadVMFieldComp(
           context_value, Context::parent_offset(), Type::ZoneHandle()));
       AddInstruction(load);
       context_value = new UseVal(load);
     }
-    Computation* store = new NativeLoadFieldComp(
+    Computation* store = new LoadVMFieldComp(

[Florian Schneider, 2012/05/24 01:15:47]

  Computation* store = ...

does not make sense here. Maybe just rewrite to:

  return new LoadVMFieldComp(

[Ivan Posva, 2012/05/29 17:35:04]

Done.

         context_value, Context::variable_offset(local.index()), local.type());
     return store;
   } else {
     return new LoadLocalComp(local, owner()->context_level());
   }
 }
 
 
 // Stores current context into the 'variable'
 void EffectGraphVisitor::BuildStoreContext(const LocalVariable& variable) {
@@ skipping 1376 matching lines @@
   }
   // The instantiator is the receiver of the caller, which is not a factory.
   // The receiver cannot be null; extract its AbstractTypeArguments object.
   // Note that in the factory case, the instantiator is the first parameter
   // of the factory, i.e. already an AbstractTypeArguments object.
   intptr_t type_arguments_instance_field_offset =
       instantiator_class.type_arguments_instance_field_offset();
   ASSERT(type_arguments_instance_field_offset != Class::kNoTypeArguments);
 
   BindInstr* load =
-      new BindInstr(new NativeLoadFieldComp(
+      new BindInstr(new LoadVMFieldComp(
                         instantiator,
                         type_arguments_instance_field_offset,
                         Type::ZoneHandle()));  // Not an instance, no type.
   AddInstruction(load);
   return new UseVal(load);
 }
 
 
 Definition* EffectGraphVisitor::BuildInstantiatedTypeArguments(
     intptr_t token_index,
@@ skipping 332 matching lines @@
   return (node == owner()->parsed_function().node_sequence()) &&
          (owner()->parsed_function().saved_context_var() != NULL);
 }
 
 
 void EffectGraphVisitor::UnchainContext() {
   BindInstr* context = new BindInstr(new CurrentContextComp());
   AddInstruction(context);
   BindInstr* parent =
       new BindInstr(
-          new NativeLoadFieldComp(
+          new LoadVMFieldComp(
               new UseVal(context),
               Context::parent_offset(),
               Type::ZoneHandle()));  // Not an instance, no type.
   AddInstruction(parent);
   AddInstruction(new DoInstr(new StoreContextComp(new UseVal(parent))));
 }
 
 
 // <Statement> ::= Sequence { scope: LocalScope
 //                            nodes: <Statement>*
@@ skipping 447 matching lines @@
   char* chars = reinterpret_cast<char*>(
       Isolate::Current()->current_zone()->Allocate(len));
   OS::SNPrint(chars, len, kFormat, function_name, reason);
   const Error& error = Error::Handle(
       LanguageError::New(String::Handle(String::New(chars))));
   Isolate::Current()->long_jump_base()->Jump(1, error);
 }
 
 
 }  // namespace dart