Refactor our IL instruction for static setters.

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 1771 matching lines @@
       new ZoneGrowableArray<PushArgumentInstr*>();
   StaticCallComp* call = new StaticCallComp(node->token_pos(),
                                             owner()->try_index(),
                                             getter_function,
                                             Array::ZoneHandle(),  // No names.
                                             arguments);
   ReturnComputation(call);
 }
 
 
-void EffectGraphVisitor::VisitStaticSetterNode(StaticSetterNode* node) {
+void EffectGraphVisitor::BuildStaticSetter(StaticSetterNode* node,
+                                           bool result_is_needed) {
   const String& setter_name =
       String::Handle(Field::SetterName(node->field_name()));
   const Function& setter_function =
       Function::ZoneHandle(node->cls().LookupStaticFunction(setter_name));
   ASSERT(!setter_function.IsNull());
   ValueGraphVisitor for_value(owner(), temp_index());
   node->value()->Visit(&for_value);
   Append(for_value);
-  StaticSetterComp* call = new StaticSetterComp(node->token_pos(),
-                                                owner()->try_index(),
-                                                setter_function,
-                                                for_value.value());
-  ReturnComputation(call);
+  Value* value = NULL;
+  if (result_is_needed) {
+    value = Bind(
+        BuildStoreLocal(*owner()->parsed_function().expression_temp_var(),
+                        for_value.value()));
+  } else {
+    value = for_value.value();
+  }
+  ZoneGrowableArray<PushArgumentInstr*>* arguments =
+      new ZoneGrowableArray<PushArgumentInstr*>(1);
+  arguments->Add(PushArgument(value));
+  StaticCallComp* call = new StaticCallComp(node->token_pos(),
+                                            owner()->try_index(),
+                                            setter_function,
+                                            Array::ZoneHandle(),  // No names.
+                                            arguments);
+  if (result_is_needed) {
+    Do(call);
+    ReturnComputation(
+         BuildLoadLocal(*owner()->parsed_function().expression_temp_var()));
+  } else {
+    ReturnComputation(call);
+  }
+}
+
+
+void EffectGraphVisitor::VisitStaticSetterNode(StaticSetterNode* node) {
+  BuildStaticSetter(node, false);  // Result not needed.
+}
+
+
+void ValueGraphVisitor::VisitStaticSetterNode(StaticSetterNode* node) {
+  BuildStaticSetter(node, true);  // Result needed.
 }
 
 
 void EffectGraphVisitor::VisitNativeBodyNode(NativeBodyNode* node) {
   NativeCallComp* native_call =
       new NativeCallComp(node, owner()->try_index());
   ReturnComputation(native_call);
 }
 
 
@@ skipping 872 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