Reviewers: Michael Starzinger,
Description:
Fix merge issue.
[email protected]
BUG=
TEST=
Please review this at https://chromiumcodereview.appspot.com/10454115/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M src/arm/stub-cache-arm.cc
M src/x64/stub-cache-x64.cc
Index: src/arm/stub-cache-arm.cc
diff --git a/src/arm/stub-cache-arm.cc b/src/arm/stub-cache-arm.cc
index
48f72e6656742a3646b59fb58f050b5236ba6731..e31e3ade5390ecdd79149587bc718cef9b749e16
100644
--- a/src/arm/stub-cache-arm.cc
+++ b/src/arm/stub-cache-arm.cc
@@ -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,
Index: src/x64/stub-cache-x64.cc
diff --git a/src/x64/stub-cache-x64.cc b/src/x64/stub-cache-x64.cc
index
3af5a46c78dcf981b56ebc5d1090f711da2f3557..41b5b48dc65382022013c4ad9021cbe2df6f9255
100644
--- a/src/x64/stub-cache-x64.cc
+++ b/src/x64/stub-cache-x64.cc
@@ -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,
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
