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

vm/code_generator_x64.cc

Index: vm/code_generator_x64.cc
===================================================================
--- vm/code_generator_x64.cc	(revision 2709)
+++ vm/code_generator_x64.cc	(working copy)
@@ -302,6 +302,7 @@
       __ 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);
   }
 }
@@ -406,8 +407,10 @@
       __ 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);
@@ -934,7 +937,9 @@
     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());
@@ -1905,6 +1910,7 @@
     __ 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);
 }