Revision: 11695
Author: [email protected]
Date: Fri Jun 1 04:09:09 2012
Log: Fix merge issue.
[email protected]
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10454115
http://code.google.com/p/v8/source/detail?r=11695
Modified:
/branches/bleeding_edge/src/arm/stub-cache-arm.cc
/branches/bleeding_edge/src/x64/stub-cache-x64.cc
=======================================
--- /branches/bleeding_edge/src/arm/stub-cache-arm.cc Fri Jun 1 03:51:36
2012
+++ /branches/bleeding_edge/src/arm/stub-cache-arm.cc Fri Jun 1 04:09:09
2012
@@ -511,14 +511,14 @@
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,
=======================================
--- /branches/bleeding_edge/src/x64/stub-cache-x64.cc Fri Jun 1 03:51:36
2012
+++ /branches/bleeding_edge/src/x64/stub-cache-x64.cc Fri Jun 1 04:09:09
2012
@@ -806,14 +806,14 @@
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
