Refactor building of StoreStaticField and StoreLocal to manually preserve value.

runtime/vm/flow_graph_builder.h

 // 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.
 
 #ifndef VM_FLOW_GRAPH_BUILDER_H_
 #define VM_FLOW_GRAPH_BUILDER_H_
 
 #include "vm/allocation.h"
 #include "vm/ast.h"
 #include "vm/growable_array.h"
@@ skipping 143 matching lines @@
   PushArgumentInstr* PushArgument(Value* value);
 
   // This implementation shares state among visitors by using the builder.
   // The implementation is incorrect if a visitor that hits a return is not
   // actually added to the graph.
   void AddReturnExit(ReturnInstr* return_instr) {
     owner()->AddReturnExit(return_instr);
   }
 
  protected:
-  Definition* BuildStoreLocal(const LocalVariable& local, Value* value);
+  Definition* BuildStoreTemp(const LocalVariable& local, Value* value);
+  Definition* BuildStoreExprTemp(Value* value);
+  Definition* BuildLoadExprTemp();
+
+  Definition* BuildStoreLocal(const LocalVariable& local,
+                              Value* value,
+                              bool result_is_needed);
   Definition* BuildLoadLocal(const LocalVariable& local);
 
+  void HandleStoreLocal(StoreLocalNode* node, bool result_is_needed);
+
   // Helpers for translating parts of the AST.
   void TranslateArgumentList(const ArgumentListNode& node,
                              ZoneGrowableArray<Value*>* values);
   void BuildPushArguments(const ArgumentListNode& node,
                           ZoneGrowableArray<PushArgumentInstr*>* values);
 
   // Creates an instantiated type argument vector used in preparation of an
   // allocation call.
   // May be called only if allocating an object of a parameterized class.
   Value* BuildInstantiatedTypeArguments(
@@ skipping 22 matching lines @@
                                                Value* value,
                                                const AbstractType& dst_type,
                                                const String& dst_name);
 
   // Perform a type check on the given value and return it.
   Value* BuildAssignableValue(intptr_t token_pos,
                               Value* value,
                               const AbstractType& dst_type,
                               const String& dst_name);
 
-  enum ResultKind {
-    kResultNotNeeded,
-    kResultNeeded
-  };
+  static const bool kResultNeeded = true;
+  static const bool kResultNotNeeded = false;
 
   Definition* BuildStoreIndexedValues(StoreIndexedNode* node,
                                       bool result_is_needed);
 
   void BuildInstanceSetterArguments(
       InstanceSetterNode* node,
       ZoneGrowableArray<PushArgumentInstr*>* arguments,
       bool result_is_needed);
 
   virtual void BuildTypeTest(ComparisonNode* node);
@@ skipping 14 matching lines @@
   Value* BuildObjectAllocation(ConstructorCallNode* node);
   void BuildConstructorCall(ConstructorCallNode* node,
                             PushArgumentInstr* alloc_value);
 
   void BuildStoreContext(const LocalVariable& variable);
   void BuildLoadContext(const LocalVariable& variable);
 
   void BuildThrowNode(ThrowNode* node);
 
   void BuildStaticSetter(StaticSetterNode* node, bool result_is_needed);
+  Definition* BuildStoreStaticField(StoreStaticFieldNode* node,
+                                    bool result_is_needed);
 
   ClosureCallInstr* BuildClosureCall(ClosureCallNode* node);
 
   Value* BuildNullValue();
 
  private:
   // Specify a definition of the final result.  Adds the definition to
   // the graph, but normally overridden in subclasses.
   virtual void ReturnDefinition(Definition* definition) {
     Do(definition);
@@ skipping 27 matching lines @@
   ValueGraphVisitor(FlowGraphBuilder* owner, intptr_t temp_index)
       : EffectGraphVisitor(owner, temp_index), value_(NULL) { }
 
   // Visit functions overridden by this class.
   virtual void VisitLiteralNode(LiteralNode* node);
   virtual void VisitAssignableNode(AssignableNode* node);
   virtual void VisitConstructorCallNode(ConstructorCallNode* node);
   virtual void VisitBinaryOpNode(BinaryOpNode* node);
   virtual void VisitConditionalExprNode(ConditionalExprNode* node);
   virtual void VisitLoadLocalNode(LoadLocalNode* node);
+  virtual void VisitStoreLocalNode(StoreLocalNode* node);
   virtual void VisitStoreIndexedNode(StoreIndexedNode* node);
   virtual void VisitStoreInstanceFieldNode(StoreInstanceFieldNode* node);
   virtual void VisitInstanceSetterNode(InstanceSetterNode* node);
   virtual void VisitThrowNode(ThrowNode* node);
   virtual void VisitClosureCallNode(ClosureCallNode* node);
   virtual void VisitStaticSetterNode(StaticSetterNode* node);
+  virtual void VisitStoreStaticFieldNode(StoreStaticFieldNode* node);
 
   Value* value() const { return value_; }
 
  protected:
   // Output parameters.
   Value* value_;
 
  private:
   // Helper to set the output state to return a Value.
   virtual void ReturnValue(Value* value) { value_ = value; }
@@ skipping 69 matching lines @@
   // Output parameters.
   GrowableArray<TargetEntryInstr**> true_successor_addresses_;
   GrowableArray<TargetEntryInstr**> false_successor_addresses_;
 
   intptr_t condition_token_pos_;
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_BUILDER_H_