AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Fix merge issue.

Browse Source 
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
This commit is contained in:
rossberg@chromium.org 2012-06-01 11:09:09 +00:00
parent e4c472a7af
commit d87249945f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/arm/stub-cache-arm.cc
View File

@ -511,14 +511,14 @@ void StubCompiler::GenerateStoreField(MacroAssembler* masm,
if (!transition.is_null()) { if (!transition.is_null()) {
// Update the map of the object. // Update the map of the object.
__ mov(scratch, Operand(transition)); __ mov(scratch1, Operand(transition));
__ str(scratch, FieldMemOperand(receiver_reg, HeapObject::kMapOffset)); __ str(scratch1, FieldMemOperand(receiver_reg, HeapObject::kMapOffset));
// Update the write barrier for the map field and pass the now unused // Update the write barrier for the map field and pass the now unused
// name_reg as scratch register. // name_reg as scratch register.
__ RecordWriteField(receiver_reg, __ RecordWriteField(receiver_reg,
HeapObject::kMapOffset, HeapObject::kMapOffset,
scratch, scratch1,
name_reg, name_reg,
kLRHasNotBeenSaved, kLRHasNotBeenSaved,
kDontSaveFPRegs, kDontSaveFPRegs,

6
src/x64/stub-cache-x64.cc
View File

@ -806,14 +806,14 @@ void StubCompiler::GenerateStoreField(MacroAssembler* masm,
if (!transition.is_null()) { if (!transition.is_null()) {
// Update the map of the object. // Update the map of the object.
__ Move(scratch, transition); __ Move(scratch1, transition);
__ movq(FieldOperand(receiver_reg, HeapObject::kMapOffset), scratch); __ movq(FieldOperand(receiver_reg, HeapObject::kMapOffset), scratch1);
// Update the write barrier for the map field and pass the now unused // Update the write barrier for the map field and pass the now unused
// name_reg as scratch register. // name_reg as scratch register.
__ RecordWriteField(receiver_reg, __ RecordWriteField(receiver_reg,
HeapObject::kMapOffset, HeapObject::kMapOffset,
scratch, scratch1,
name_reg, name_reg,
kDontSaveFPRegs, kDontSaveFPRegs,
OMIT_REMEMBERED_SET, OMIT_REMEMBERED_SET,