Implement increment of locals.

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/flags.h"
 #include "vm/intermediate_language.h"
 #include "vm/longjump.h"
@@ skipping 321 matching lines @@
                                                ? Token::Str(Token::kNEGATE)
                                                : node->Name()));
   InstanceCallComp* call =
       new InstanceCallComp(node->id(), node->token_index(), name,
                            arguments, Array::ZoneHandle(), 1);
   ReturnComputation(call);
 }
 
 
 void EffectGraphVisitor::VisitIncrOpLocalNode(IncrOpLocalNode* node) {
-  Bailout("EffectGraphVisitor::VisitIncrOpLocalNode");
+  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.
+  LoadLocalComp* load = new LoadLocalComp(node->local());
+  AddInstruction(new BindInstr(temp_index(), load));
+  // 2. Increment.
+  BuildIncrOpIncrement(node->kind(), node->id(), node->token_index(),
+                       temp_index() + 1);
+  // 3. Perform the store, resulting in the new value.
+  StoreLocalComp* store =
+      new StoreLocalComp(node->local(), new TempVal(temp_index()));
+  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.
+  LoadLocalComp* load = new LoadLocalComp(node->local());
+  AddInstruction(new BindInstr(temp_index(), load));
+  // 2. Duplicate it to increment.
+  AddInstruction(new PickTempInstr(temp_index() + 1, temp_index()));
+  // 3. Increment.
+  BuildIncrOpIncrement(node->kind(), node->id(), node->token_index(),
+                       temp_index() + 2);
+  // 4. Perform the store and return the original value.
+  StoreLocalComp* store =
+      new StoreLocalComp(node->local(), new TempVal(temp_index() + 1));
+  AddInstruction(new DoInstr(store));
+  ReturnValue(new TempVal(AllocateTempIndex()));
+}
+
+
 int EffectGraphVisitor::BuildIncrOpFieldLoad(IncrOpInstanceFieldNode* node,
                                              int start_index) {
   // Evaluate the receiver and duplicate it (it has two uses).
   //   t_n   <- ... receiver ...
   //   t_n+1 <- Pick(t_n)
   ArgumentGraphVisitor for_receiver(owner(), start_index);
   node->receiver()->Visit(&for_receiver);
   Append(for_receiver);
   const int next_index = for_receiver.temp_index();
   ASSERT(next_index == start_index + 1);
@@ skipping 761 matching lines @@
 }
 
 
 void FlowGraphPrinter::VisitDo(DoInstr* instr) {
   OS::Print("    ");
   instr->computation()->Accept(this);
 }
 
 
 void FlowGraphPrinter::VisitBind(BindInstr* instr) {
-  OS::Print("    t%d <-", instr->temp_index());
+  OS::Print("    t%d <- ", instr->temp_index());
   instr->computation()->Accept(this);
 }
 
 
 void FlowGraphPrinter::VisitReturn(ReturnInstr* instr) {
   OS::Print("    return ");
   instr->value()->Accept(this);
 }
 
 
@@ skipping 38 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