Inline setters, getters, various cleanups & restructuring.

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 1733 matching lines @@
   arguments->Add(for_receiver.value());
   const String& name =
       String::ZoneHandle(Field::GetterSymbol(node->field_name()));
   InstanceCallComp* call = new InstanceCallComp(
       node->token_index(), owner()->try_index(), name,
       arguments, Array::ZoneHandle(), 1);
   ReturnComputation(call);
 }
 
 
-void EffectGraphVisitor::VisitInstanceSetterNode(InstanceSetterNode* node) {
+void EffectGraphVisitor::BuildInstanceSetterValues(
+    InstanceSetterNode* node, Value** receiver, Value** value) {
   ValueGraphVisitor for_receiver(owner(), temp_index());
   node->receiver()->Visit(&for_receiver);
   Append(for_receiver);
   ValueGraphVisitor for_value(owner(), for_receiver.temp_index());
   node->value()->Visit(&for_value);
   Append(for_value);
+  *receiver = for_receiver.value();
+  *value = for_value.value();
+}
+
+
+void EffectGraphVisitor::VisitInstanceSetterNode(InstanceSetterNode* node) {
+  Value *receiver, *value;
+  BuildInstanceSetterValues(node, &receiver, &value);
   InstanceSetterComp* setter =
       new InstanceSetterComp(node->token_index(),
                              owner()->try_index(),
                              node->field_name(),
-                             for_receiver.value(),
-                             for_value.value());
+                             receiver,
+                             value);
   ReturnComputation(setter);
 }
 
 
+void ValueGraphVisitor::VisitInstanceSetterNode(InstanceSetterNode* node) {
+  Value *receiver, *value;
+  BuildInstanceSetterValues(node, &receiver, &value);
+  BindInstr* store_local_instr = new BindInstr(
+      BuildStoreLocal(*owner()->parsed_function().expression_temp_var(),
+                      value));
+  AddInstruction(store_local_instr);
+  UseVal* saved_value = new UseVal(store_local_instr);
+  InstanceSetterComp* setter =
+      new InstanceSetterComp(node->token_index(),
+                             owner()->try_index(),
+                             node->field_name(),
+                             receiver,
+                             saved_value);
+  AddInstruction(new DoInstr(setter));
+  ReturnComputation(
+       BuildLoadLocal(*owner()->parsed_function().expression_temp_var()));
+}
+
+
 void EffectGraphVisitor::VisitStaticGetterNode(StaticGetterNode* node) {
   const String& getter_name =
       String::Handle(Field::GetterName(node->field_name()));
   const Function& getter_function =
       Function::ZoneHandle(node->cls().LookupStaticFunction(getter_name));
   ASSERT(!getter_function.IsNull());
   ZoneGrowableArray<Value*>* values = new ZoneGrowableArray<Value*>();
   StaticCallComp* call = new StaticCallComp(node->token_index(),
                                             owner()->try_index(),
                                             getter_function,
@@ skipping 66 matching lines @@
   Computation* store = BuildStoreLocal(node->local(), store_value);
   ReturnComputation(store);
 }
 
 
 void EffectGraphVisitor::VisitLoadInstanceFieldNode(
     LoadInstanceFieldNode* node) {
   ValueGraphVisitor for_instance(owner(), temp_index());
   node->instance()->Visit(&for_instance);
   Append(for_instance);
-  LoadInstanceFieldComp* load =
-      new LoadInstanceFieldComp(node, for_instance.value());
+  LoadInstanceFieldComp* load = new LoadInstanceFieldComp(
+      node->field(), for_instance.value(), NULL, NULL);
   ReturnComputation(load);
 }
 
 
 void EffectGraphVisitor::VisitStoreInstanceFieldNode(
     StoreInstanceFieldNode* node) {
   ValueGraphVisitor for_instance(owner(), temp_index());
   node->instance()->Visit(&for_instance);
   Append(for_instance);
   ValueGraphVisitor for_value(owner(), for_instance.temp_index());
   node->value()->Visit(&for_value);
   Append(for_value);
   Value* store_value = for_value.value();
   if (FLAG_enable_type_checks) {
     const AbstractType& type = AbstractType::ZoneHandle(node->field().type());
     const String& dst_name = String::ZoneHandle(node->field().name());
     store_value = BuildAssignableValue(node->value()->token_index(),
                                        store_value,
                                        type,
                                        dst_name);
   }
-  StoreInstanceFieldComp* store =
-      new StoreInstanceFieldComp(node, for_instance.value(), store_value);
+  StoreInstanceFieldComp* store = new StoreInstanceFieldComp(
+      node->field(), for_instance.value(), store_value, NULL, NULL);
   ReturnComputation(store);
 }
 
 
+// StoreInstanceFieldNode does not return result.
+void ValueGraphVisitor::VisitStoreInstanceFieldNode(
+    StoreInstanceFieldNode* node) {
+  UNIMPLEMENTED();
+}
+
+
 void EffectGraphVisitor::VisitLoadStaticFieldNode(LoadStaticFieldNode* node) {
   LoadStaticFieldComp* load = new LoadStaticFieldComp(node->field());
   ReturnComputation(load);
 }
 
 
 void EffectGraphVisitor::VisitStoreStaticFieldNode(StoreStaticFieldNode* node) {
   ValueGraphVisitor for_value(owner(), temp_index());
   node->value()->Visit(&for_value);
   Append(for_value);
@@ skipping 555 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