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

runtime/vm/code_generator_x64.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/globals.h"  // Needed here to get TARGET_ARCH_X64.
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/code_generator.h"
 
 #include "lib/error.h"
@@ skipping 1097 matching lines @@
                        operator_name,
                        kNumberOfArguments,
                        kNoArgumentNames,
                        kNumArgumentsChecked);
   if (IsResultNeeded(node)) {
     __ pushq(RAX);
   }
 }
 
 
-void CodeGenerator::VisitIncrOpLocalNode(IncrOpLocalNode* node) {
-  ASSERT((node->kind() == Token::kINCR) || (node->kind() == Token::kDECR));
-  MarkDeoptPoint(node->id(), node->token_index());
-  GenerateLoadVariable(RAX, node->local());
-  if (!node->prefix() && IsResultNeeded(node)) {
-    // Preserve as result.
-    __ pushq(RAX);
-  }
-  const char* operator_name = (node->kind() == Token::kINCR) ? "+" : "-";
-  __ pushq(RAX);
-  __ pushq(Immediate(Smi::RawValue(1)));
-  GenerateBinaryOperatorCall(node->id(), node->token_index(), operator_name);
-  // result is in RAX.
-  if (FLAG_enable_type_checks) {
-    GenerateAssertAssignable(node->id(),
-                             node->token_index(),
-                             NULL,
-                             node->local().type(),
-                             node->local().name());
-  }
-  GenerateStoreVariable(node->local(), RAX, RDX);
-  if (node->prefix() && IsResultNeeded(node)) {
-    __ pushq(RAX);
-  }
-}
-
-
 void CodeGenerator::VisitIncrOpInstanceFieldNode(
     IncrOpInstanceFieldNode* node) {
   ASSERT((node->kind() == Token::kINCR) || (node->kind() == Token::kDECR));
   node->receiver()->Visit(this);
   __ pushq(Address(RSP, 0));  // Duplicate receiver (preserve for setter).
   MarkDeoptPoint(node->getter_id(), node->token_index());
   GenerateInstanceGetterCall(node->getter_id(),
                              node->token_index(),
                              node->field_name());
   // result is in RAX.
@@ skipping 1601 matching lines @@
   const Error& error = Error::Handle(
       Parser::FormatError(script, token_index, "Error", format, args));
   va_end(args);
   Isolate::Current()->long_jump_base()->Jump(1, error);
   UNREACHABLE();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64