X64: check all cases with "__ movq(FieldAddress" and converted them to StoreIntoObject if appropr...

vm/code_generator_x64.cc

 // Copyright (c) 2011, 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 284 matching lines @@
     __ nop(5);
     const Function& function =
         Function::ZoneHandle(parsed_function_.function().raw());
     __ LoadObject(RAX, function);
     __ movq(R8, FieldAddress(RAX, Function::invocation_counter_offset()));
     __ incq(R8);
     if (may_optimize) {
       __ cmpq(R8, Immediate(FLAG_optimization_invocation_threshold));
       __ j(GREATER, &StubCode::OptimizeInvokedFunctionLabel());
     }
+    // R8 contains an integer value, not an object.

[cshapiro, 2011/12/21 19:45:06]

Presumably, "integer value" means raw- or unboxed-integer value and not an
integer object, right?  The incq might be enough to give that away.

[srdjan, 2011/12/21 21:29:12]

That is correct. The increment operation could also mean that it is handled
incorrectly, and the comment confirms the fact that we are handling an unboxed
value.

     __ movq(FieldAddress(RAX, Function::invocation_counter_offset()), R8);
   }
 }
 
 
 // Verify assumptions (in debug mode only).
 // - No two deopt descriptors have the same node id (deoptimization).
 // - No two ic-call descriptors have the same node id (type feedback).
 // - No two descriptors of same kind have the same PC.
 // A function without unique ids is marked as non-optimizable (e.g., because of
@@ skipping 84 matching lines @@
                                           Register scratch) {
   if (variable.is_captured()) {
     // The variable lives in the context.
     int delta = state()->context_level() - variable.owner()->context_level();
     ASSERT(delta >= 0);
     Register base = CTX;
     while (delta-- > 0) {
       __ movq(scratch, FieldAddress(base, Context::parent_offset()));
       base = scratch;
     }
-    __ movq(FieldAddress(base, Context::variable_offset(variable.index())),
-            src);
+    __ StoreIntoObject(
+        base,
+        FieldAddress(base, Context::variable_offset(variable.index())),
+        src);
   } else {
     // The variable lives in the current stack frame.
     __ movq(Address(RBP, variable.index() * kWordSize), src);
   }
 }
 
 
 void CodeGenerator::GeneratePushVariable(const LocalVariable& variable,
                                          Register scratch) {
   if (variable.is_captured()) {
@@ skipping 506 matching lines @@
       (scope != NULL) ? scope->num_context_variables() : 0;
   if (num_context_variables > 0) {
     // The loop local scope declares variables that are captured.
     // Allocate and chain a new context.
     __ movq(R10, Immediate(num_context_variables));
     const ExternalLabel label("alloc_context",
                               StubCode::AllocateContextEntryPoint());
     GenerateCall(node_sequence->token_index(), &label);
 
     // Chain the new context in RAX to its parent in CTX.
-    __ movq(FieldAddress(RAX, Context::parent_offset()), CTX);
+    __ StoreIntoObject(RAX,
+                       FieldAddress(RAX, Context::parent_offset()),
+                       CTX);
     // Set new context as current context.
     __ movq(CTX, RAX);
     state()->set_context_level(scope->context_level());
 
     // If this node_sequence is the body of the function being compiled, copy
     // the captured parameters from the frame into the context.
     if (node_sequence == parsed_function_.node_sequence()) {
       ASSERT(scope->context_level() == 1);
       const Immediate raw_null =
           Immediate(reinterpret_cast<intptr_t>(Object::null()));
@@ skipping 950 matching lines @@
   const Function& function =
       Function::ZoneHandle(parsed_function_.function().raw());
   __ LoadObject(RAX, function);
   __ movq(RBX, FieldAddress(RAX, Function::invocation_counter_offset()));
   __ incq(RBX);
   if (!FLAG_report_invocation_count) {
     // Prevent overflow.
     __ cmpq(RBX, Immediate(FLAG_optimization_invocation_threshold));
     __ j(GREATER, &done);
   }
+  // RBX contains an integer value, not an object.
   __ movq(FieldAddress(RAX, Function::invocation_counter_offset()), RBX);
   __ Bind(&done);
 }
 
 
 void CodeGenerator::VisitWhileNode(WhileNode* node) {
   const Bool& bool_true = Bool::ZoneHandle(Bool::True());
   SourceLabel* label = node->label();
   __ Bind(label->continue_label());
   node->condition()->Visit(this);
@@ skipping 877 matching lines @@
                         message_buffer, kMessageBufferSize,
                         format, args);
   va_end(args);
   Isolate::Current()->long_jump_base()->Jump(1, message_buffer);
   UNREACHABLE();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64