Materialize all constant operands on the stack in the non-optimizing compiler.

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 146 matching lines @@
 
   // Perform a type check on the given value.
   void BuildAssertAssignable(intptr_t node_id,
                              intptr_t token_index,
                              Value* value,
                              const AbstractType& dst_type,
                              const String& dst_name,
                              intptr_t start_index);
 
   // Perform a type check on the given value and return it.
-  Value* BuildAssignableValue(intptr_t node_id,
-                              intptr_t token_index,
+  Value* BuildAssignableValue(intptr_t assignment_node_id,
+                              AstNode* value_node,
                               Value* value,
                               const AbstractType& dst_type,
                               const String& dst_name,
                               intptr_t start_index);
 
   virtual void BuildInstanceOf(ComparisonNode* node);
 
   bool MustSaveRestoreContext(SequenceNode* node) const;
 
   // Moves parent context into the context register.
@@ skipping 56 matching lines @@
   virtual void VisitThrowNode(ThrowNode* 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; }
+  virtual void ReturnValue(Value* value) {
+    ASSERT(value->IsUse() || value->IsTemp());
+    value_ = value;
+  }
 
   // Specify a computation as the final result.  Adds a Bind instruction to
   // the graph and returns its temporary value (i.e., set the output
   // parameters).
   virtual void ReturnComputation(Computation* computation) {
     BindInstr* defn = new BindInstr(temp_index(), computation);
     AddInstruction(defn);
     AllocateTempIndex();
     value_ = new UseVal(defn);
   }
 
   virtual void CompiletimeStringInterpolation(const Function& interpol_func,
                                               const Array& literals);
 
   virtual void BuildInstanceOf(ComparisonNode* node);
 };
 
 
-// Translate an AstNode to a control-flow graph fragment for both its effects
-// and value as an outgoing argument.  Implements a function from an AstNode
-// and next temporary index to a graph fragment (as in the
-// EffectGraphBuilder), an updated temporary index, and an intermediate
-// language Value.
-class ArgumentGraphVisitor : public ValueGraphVisitor {
- public:
-  ArgumentGraphVisitor(FlowGraphBuilder* owner, intptr_t temp_index)
-      : ValueGraphVisitor(owner, temp_index) { }
-
- private:
-  // Override the returning of constants to ensure they are materialized.
-  virtual void ReturnValue(Value* value);
-};
-
-
 // Translate an AstNode to a control-flow graph fragment for both its
 // effects and true/false control flow (e.g., for an expression in a test
 // context).  The resulting graph is always closed (even if it is empty)
 // Successor control flow is explicitly set by a pair of pointers to
 // TargetEntryInstr*.
 //
 // To distinguish between the graphs with only nonlocal exits and graphs
 // with both true and false exits, there are a pair of TargetEntryInstr**:
 //
 //   - Both NULL: only non-local exits, truly closed
@@ skipping 10 matching lines @@
                    intptr_t temp_index,
                    intptr_t condition_node_id,
                    intptr_t condition_token_index)
       : ValueGraphVisitor(owner, temp_index),
         true_successor_address_(NULL),
         false_successor_address_(NULL),
         condition_node_id_(condition_node_id),
         condition_token_index_(condition_token_index) {
   }
 
-  // Visit functions overridden by this class.
-  virtual void VisitLiteralNode(LiteralNode* node);
-  virtual void VisitLoadLocalNode(LoadLocalNode* node);
-
   TargetEntryInstr** true_successor_address() const {
     ASSERT(true_successor_address_ != NULL);
     return true_successor_address_;
   }
   TargetEntryInstr** false_successor_address() const {
     ASSERT(false_successor_address_ != NULL);
     return false_successor_address_;
   }
 
   intptr_t condition_node_id() const { return condition_node_id_; }
@@ skipping 16 matching lines @@
   TargetEntryInstr** true_successor_address_;
   TargetEntryInstr** false_successor_address_;
 
   intptr_t condition_node_id_;
   intptr_t condition_token_index_;
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_BUILDER_H_