Eliminate IncrOpStaticFieldNode, replace a set of nodes.

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 1177 matching lines @@
   __ pushq(RDX);  // Receiver.
   __ pushq(RAX);  // Value.
   // It is not necessary to generate a type test of the assigned value here,
   // because the setter will check the type of its incoming arguments.
   GenerateInstanceSetterCall(node->setter_id(),
                              node->token_index(),
                              node->field_name());
 }
 
 
-void CodeGenerator::VisitIncrOpStaticFieldNode(IncrOpStaticFieldNode* node) {
-  ASSERT((node->kind() == Token::kINCR) || (node->kind() == Token::kDECR));
-  MarkDeoptPoint(node->id(), node->token_index());
-  if (node->field().IsNull()) {
-    GenerateStaticGetterCall(node->token_index(),
-                             node->field_class(),
-                             node->field_name());
-  } else {
-    __ LoadObject(RDX, node->field());
-    __ movq(RAX, FieldAddress(RDX, Field::value_offset()));
-  }
-  // Value in RAX.
-  if (!node->prefix() && IsResultNeeded(node)) {
-    // Preserve as result.
-    __ pushq(RAX);
-  }
-  const Immediate value = Immediate(reinterpret_cast<int64_t>(Smi::New(1)));
-  const char* operator_name = (node->kind() == Token::kINCR) ? "+" : "-";
-  __ pushq(RAX);    // Left operand.
-  __ pushq(value);  // Right operand.
-  GenerateBinaryOperatorCall(node->id(), node->token_index(), operator_name);
-  // result is in RAX.
-  if (node->prefix() && IsResultNeeded(node)) {
-    __ pushq(RAX);
-  }
-  if (node->field().IsNull()) {
-    __ pushq(RAX);
-    // It is not necessary to generate a type test of the assigned value here,
-    // because the setter will check the type of its incoming arguments.
-    GenerateStaticSetterCall(node->token_index(),
-                             node->field_class(),
-                             node->field_name());
-  } else {
-    if (FLAG_enable_type_checks) {
-      GenerateAssertAssignable(node->id(),
-                               node->token_index(),
-                               AbstractType::ZoneHandle(node->field().type()),
-                               String::ZoneHandle(node->field().name()));
-    }
-    __ LoadObject(RDX, node->field());
-    __ StoreIntoObject(RDX, FieldAddress(RDX, Field::value_offset()), RAX);
-  }
-}
-
-
 void CodeGenerator::VisitIncrOpIndexedNode(IncrOpIndexedNode* node) {
   ASSERT((node->kind() == Token::kINCR) || (node->kind() == Token::kDECR));
   node->array()->Visit(this);
   node->index()->Visit(this);
   MarkDeoptPoint(node->id(), node->token_index());
   // Preserve array and index for GenerateStoreIndex.
   __ pushq(Address(RSP, kWordSize));  // Copy array.
   __ pushq(Address(RSP, kWordSize));  // Copy index.
   GenerateLoadIndexed(node->load_id(), node->token_index());
   // Result is in RAX.
@@ skipping 1451 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