Add Load/Store Static/Instance fields.

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/flags.h"
 #include "vm/intermediate_language.h"
 #include "vm/longjump.h"
 #include "vm/os.h"
@@ skipping 530 matching lines @@
     value = new TempVal(temp_index());
   }
 
   StoreLocalComp* store = new StoreLocalComp(node->local(), value);
   ReturnComputation(store);
 }
 
 
 void EffectGraphVisitor::VisitLoadInstanceFieldNode(
     LoadInstanceFieldNode* node) {
-  Bailout("EffectGraphVisitor::VisitLoadInstanceFieldNode");
+  ValueGraphVisitor for_instance(owner(), temp_index());
+  node->instance()->Visit(&for_instance);
+  Append(for_instance);
+  LoadInstanceFieldComp* load =
+      new LoadInstanceFieldComp(node, for_instance.value());
+  ReturnComputation(load);
 }
 
 
 void EffectGraphVisitor::VisitStoreInstanceFieldNode(
     StoreInstanceFieldNode* node) {
-  Bailout("EffectGraphVisitor::VisitStoreInstanceFieldNode");
+  ValueGraphVisitor for_instance(owner(), temp_index());
+  node->instance()->Visit(&for_instance);
+  Append(for_instance);
+  ValueGraphVisitor for_value(owner(), temp_index());

[Kevin Millikin (Google), 2012/03/05 11:02:41]

Second argument should be for_instance.temp_index().

[srdjan, 2012/03/05 18:35:21]

Done.

+  node->value()->Visit(&for_value);
+  Append(for_value);
+  StoreInstanceFieldComp* store =
+      new StoreInstanceFieldComp(node, for_instance.value(), for_value.value());
+  ReturnComputation(store);
 }
 
 
 void EffectGraphVisitor::VisitLoadStaticFieldNode(LoadStaticFieldNode* node) {
-  Bailout("EffectGraphVisitor::VisitLoadStaticFieldNode");
+  LoadStaticFieldComp* load = new LoadStaticFieldComp(node->field());
+  ReturnComputation(load);
 }
 
 
 void EffectGraphVisitor::VisitStoreStaticFieldNode(StoreStaticFieldNode* node) {
-  Bailout("EffectGraphVisitor::VisitStoreStaticFieldNode");
+  ValueGraphVisitor for_value(owner(), temp_index());
+  node->value()->Visit(&for_value);
+  Append(for_value);
+  StoreStaticFieldComp* store =
+      new StoreStaticFieldComp(node, for_value.value());
+  ReturnComputation(store);
 }
 
 
 void EffectGraphVisitor::VisitLoadIndexedNode(LoadIndexedNode* node) {
   ArgumentGraphVisitor for_array(owner(), temp_index());
   node->array()->Visit(&for_array);
   Append(for_array);
   ArgumentGraphVisitor for_index(owner(), for_array.temp_index());
   node->index_expr()->Visit(&for_index);
   Append(for_index);
@@ skipping 187 matching lines @@
   comp->value()->Accept(this);
   OS::Print(")");
 }
 
 
 void FlowGraphPrinter::VisitNativeCall(NativeCallComp* comp) {
   OS::Print("NativeCall(%s)", comp->native_name().ToCString());
 }
 
 
+void FlowGraphPrinter::VisitLoadInstanceField(LoadInstanceFieldComp* comp) {
+  OS::Print("LoadInstanceField(%s, ", String::Handle(comp->name()).ToCString());
+  comp->instance()->Accept(this);
+  OS::Print(")");
+}
+
+
+void FlowGraphPrinter::VisitStoreInstanceField(StoreInstanceFieldComp* comp) {
+  OS::Print("StoreInstanceField(%s, ",
+      String::Handle(comp->field_name()).ToCString());
+  comp->instance()->Accept(this);
+  OS::Print(", ");
+  comp->value()->Accept(this);
+  OS::Print(")");
+}
+
+
+void FlowGraphPrinter::VisitLoadStaticField(LoadStaticFieldComp* comp) {
+  OS::Print("LoadStaticField(%s)",
+      String::Handle(comp->field().name()).ToCString());
+}
+
+
+void FlowGraphPrinter::VisitStoreStaticField(StoreStaticFieldComp* comp) {
+  OS::Print("StoreStaticField(%s, ",
+      String::Handle(comp->field().name()).ToCString());
+  comp->value()->Accept(this);
+  OS::Print(")");
+}
+
+
 void FlowGraphPrinter::VisitStoreIndexed(StoreIndexedComp* comp) {
   OS::Print("StoreIndexed(");
   comp->placeholder()->Accept(this);
   OS::Print(", ");
   comp->array()->Accept(this);
   OS::Print(", ");
   comp->index()->Accept(this);
   OS::Print(", ");
   comp->value()->Accept(this);
   OS::Print(")");
@@ skipping 76 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