Commit d8724994 authored by rossberg@chromium.org's avatar rossberg@chromium.org

Fix merge issue.

R=mstarzinger@chromium.org
BUG=
TEST=

Review URL: https://chromiumcodereview.appspot.com/10454115

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@11695 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent e4c472a7
......@@ -511,14 +511,14 @@ void StubCompiler::GenerateStoreField(MacroAssembler* masm,
if (!transition.is_null()) {
// Update the map of the object.
__ mov(scratch, Operand(transition));
__ str(scratch, FieldMemOperand(receiver_reg, HeapObject::kMapOffset));
__ mov(scratch1, Operand(transition));
__ str(scratch1, FieldMemOperand(receiver_reg, HeapObject::kMapOffset));
// Update the write barrier for the map field and pass the now unused
// name_reg as scratch register.
__ RecordWriteField(receiver_reg,
HeapObject::kMapOffset,
scratch,
scratch1,
name_reg,
kLRHasNotBeenSaved,
kDontSaveFPRegs,
......
......@@ -806,14 +806,14 @@ void StubCompiler::GenerateStoreField(MacroAssembler* masm,
if (!transition.is_null()) {
// Update the map of the object.
__ Move(scratch, transition);
__ movq(FieldOperand(receiver_reg, HeapObject::kMapOffset), scratch);
__ Move(scratch1, transition);
__ movq(FieldOperand(receiver_reg, HeapObject::kMapOffset), scratch1);
// Update the write barrier for the map field and pass the now unused
// name_reg as scratch register.
__ RecordWriteField(receiver_reg,
HeapObject::kMapOffset,
scratch,
scratch1,
name_reg,
kDontSaveFPRegs,
OMIT_REMEMBERED_SET,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment