Handle instance field and indexed increment operations.

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 76 matching lines @@
   // successor of the loop condition.
   void TieLoop(const TestGraphVisitor& test_fragment,
                const EffectGraphVisitor& body_fragment);
 
  protected:
   // Helpers for translating parts of the AST.
   void TranslateArgumentList(const ArgumentListNode& node,
                              intptr_t next_temp_index,
                              ZoneGrowableArray<Value*>* values);
 
+  // Build the load part of a instance field increment.  Translates the
+  // receiver and loads the value.  The receiver will be named with
+  // start_index, the temporary index of the value is returned (always
+  // start_index+1).
+  int BuildIncrOpFieldLoad(IncrOpInstanceFieldNode* node, int start_index);
+
+  // Build the load part of an indexed increment.  Translates the receiver
+  // and index and loads the value.  The receiver will be named with
+  // start_index, the index with start_index+1, and the temporary index of
+  // the value is returned (always start_index+2).
+  int BuildIncrOpIndexedLoad(IncrOpIndexedNode* node, int start_index);
+
+  // Build the increment part of an increment operation (add or subtract 1).
+  // The original value is expected to be named with start_index-1, and the
+  // result will be named with start_index.
+  void BuildIncrOpIncrement(Token::Kind kind,

[Kevin Millikin (Google), 2012/03/07 13:44:55]

I suspect that there is a more general helper (for any binary op) lurking in
here.

+                            intptr_t node_id,
+                            intptr_t token_index,
+                            int start_index);
+
   void CloseFragment() { exit_ = NULL; }
   intptr_t AllocateTempIndex() { return temp_index_++; }
 
  private:
-  // Specify a value as the final result.  Does nothing in an effect context
-  // but is normally overridden by subclasses.
-  virtual void ReturnValue(Value* value) { }
-
   // Specify a computation as the final result.  Adds a Do instruction to
   // the graph, but normally overridden in subclasses.
   virtual void ReturnComputation(Computation* computation) {
     AddInstruction(new DoInstr(computation));
   }
 
   // Shared global state.
   FlowGraphBuilder* owner_;
 
   // Input parameters.
@@ skipping 11 matching lines @@
 // in the EffectGraphVisitor), a next temporary index, and an intermediate
 // language Value.
 class ValueGraphVisitor : public EffectGraphVisitor {
  public:
   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 VisitLoadLocalNode(LoadLocalNode* node);
+  virtual void VisitIncrOpInstanceFieldNode(IncrOpInstanceFieldNode* node);
+  virtual void VisitIncrOpIndexedNode(IncrOpIndexedNode* 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 31 matching lines @@
 // 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
 //   - Neither NULL: true and false successors at the given addresses
 //
 // We expect that AstNode in test contexts either have only nonlocal exits
 // or else control flow has both true and false successors.
-class TestGraphVisitor : public EffectGraphVisitor {
+class TestGraphVisitor : public ValueGraphVisitor {
  public:
   TestGraphVisitor(FlowGraphBuilder* owner, intptr_t temp_index)
-      : EffectGraphVisitor(owner, temp_index),
+      : ValueGraphVisitor(owner, temp_index),
         true_successor_address_(NULL),
         false_successor_address_(NULL) {
   }
 
   // Visit functions overridden by this class.
   virtual void VisitLiteralNode(LiteralNode* node);
   virtual void VisitLoadLocalNode(LoadLocalNode* node);
 
   bool can_be_true() const {
     // Either both successors are set or neither is set.
@@ skipping 13 matching lines @@
     return true_successor_address_;
   }
   BlockEntryInstr** false_successor_address() const {
     ASSERT(can_be_false());
     return false_successor_address_;
   }
 
  private:
   // Construct and concatenate a Branch instruction to this graph fragment.
   // Closes the fragment and sets the output parameters.
-  void ReturnValue(Value* value);
+  virtual void ReturnValue(Value* value);
 
   // Specify a computation as the final result.  Adds a Bind instruction to
   // the graph and branches on its value.
   virtual void ReturnComputation(Computation* computation) {
     AddInstruction(new BindInstr(temp_index(), computation));
     ReturnValue(new TempVal(temp_index()));
   }
 
   // Output parameters.
   BlockEntryInstr** true_successor_address_;
   BlockEntryInstr** false_successor_address_;
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_BUILDER_H_