Step toward eliminating increment nodes, starting with increment local. Fix a bug in evaluating sid…

runtime/vm/flow_graph_builder.cc

Index: runtime/vm/flow_graph_builder.cc
===================================================================
--- runtime/vm/flow_graph_builder.cc	(revision 7257)
+++ runtime/vm/flow_graph_builder.cc	(working copy)
@@ -728,62 +728,6 @@
 }
 
 
-void EffectGraphVisitor::VisitIncrOpLocalNode(IncrOpLocalNode* node) {
-  ASSERT((node->kind() == Token::kINCR) || (node->kind() == Token::kDECR));
-  // In an effect context, treat postincrement as if it were preincrement
-  // because its value is not needed.
-
-  // 1. Load the value.
-  BindInstr* load =
-      new BindInstr(temp_index(),
-                    new LoadLocalComp(node->local(), owner()->context_level()));
-  AddInstruction(load);
-  AllocateTempIndex();
-  // 2. Increment.
-  Definition* incr =
-      BuildIncrOpIncrement(node->kind(), node->token_index(), new UseVal(load));
-  // 3. Perform the store, resulting in the new value.
-  DeallocateTempIndex();  // Consuming incr.
-  StoreLocalComp* store = new StoreLocalComp(
-      node->local(), new UseVal(incr), owner()->context_level());
-  ReturnComputation(store);
-}
-
-
-void ValueGraphVisitor::VisitIncrOpLocalNode(IncrOpLocalNode* node) {
-  ASSERT((node->kind() == Token::kINCR) || (node->kind() == Token::kDECR));
-  if (node->prefix()) {
-    // Base class handles preincrement.
-    EffectGraphVisitor::VisitIncrOpLocalNode(node);
-    return;
-  }
-  // For postincrement, duplicate the original value to use one copy as the
-  // result.
-  //
-  // 1. Load the value.
-  BindInstr* load =
-      new BindInstr(temp_index(),
-                    new LoadLocalComp(node->local(), owner()->context_level()));
-  AddInstruction(load);
-  AllocateTempIndex();
-  // 2. Duplicate it to increment.
-  PickTempInstr* duplicate =
-      new PickTempInstr(temp_index(), load->temp_index());
-  AddInstruction(duplicate);
-  AllocateTempIndex();
-  // 3. Increment.
-  Definition* incr =
-      BuildIncrOpIncrement(node->kind(), node->token_index(),
-                           new UseVal(duplicate));
-  // 4. Perform the store and return the original value.
-  DeallocateTempIndex();  // Consuming incr.
-  StoreLocalComp* store = new StoreLocalComp(
-      node->local(), new UseVal(incr), owner()->context_level());
-  AddInstruction(new DoInstr(store));
-  ReturnValue(new UseVal(load));
-}
-
-
 Definition* EffectGraphVisitor::BuildIncrOpFieldLoad(
     IncrOpInstanceFieldNode* node,
     Value** receiver) {