- Rename NativeLoadField/NativeStoreField to LoadVMField/StoreVMField.

runtime/vm/flow_graph_builder.cc

Index: runtime/vm/flow_graph_builder.cc
===================================================================
--- runtime/vm/flow_graph_builder.cc	(revision 7935)
+++ runtime/vm/flow_graph_builder.cc	(working copy)
@@ -157,12 +157,12 @@
     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,
@@ -183,12 +183,12 @@
     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 {
@@ -1585,7 +1585,7 @@
   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.
@@ -1938,7 +1938,7 @@
   AddInstruction(context);
   BindInstr* parent =
       new BindInstr(
-          new NativeLoadFieldComp(
+          new LoadVMFieldComp(
               new UseVal(context),
               Context::parent_offset(),
               Type::ZoneHandle()));  // Not an instance, no type.