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

runtime/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/code_descriptors.h"
 #include "vm/dart_entry.h"
 #include "vm/flags.h"
@@ skipping 710 matching lines @@
       String::ZoneHandle(String::NewSymbol((node->kind() == Token::kSUB)
                                                ? Token::Str(Token::kNEGATE)
                                                : node->Name()));
   InstanceCallComp* call = new InstanceCallComp(
       node->token_index(), owner()->try_index(), name,
       arguments, Array::ZoneHandle(), 1);
   ReturnComputation(call);
 }
 
 
-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) {
   // Evaluate the receiver and duplicate it (it has two uses).
   //   t_n   <- ... receiver ...
   //   t_n+1 <- Pick(t_n)
   ValueGraphVisitor for_receiver(owner(), temp_index());
   node->receiver()->Visit(&for_receiver);
   Append(for_receiver);
   AllocateTempIndex();
@@ skipping 2131 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