| Index: src/ic/arm/handler-compiler-arm.cc
|
| diff --git a/src/ic/arm/handler-compiler-arm.cc b/src/ic/arm/handler-compiler-arm.cc
|
| index 9a774e85086343bd923dda223db9f2242a758ee1..2661694c56c94cfd0dcc7378b6cf50eaa81279e6 100644
|
| --- a/src/ic/arm/handler-compiler-arm.cc
|
| +++ b/src/ic/arm/handler-compiler-arm.cc
|
| @@ -18,7 +18,8 @@ namespace internal {
|
|
|
| void NamedLoadHandlerCompiler::GenerateLoadViaGetter(
|
| MacroAssembler* masm, Handle<HeapType> type, Register receiver,
|
| - Register holder, int accessor_index, int expected_arguments) {
|
| + Register holder, int accessor_index, int expected_arguments,
|
| + Register scratch) {
|
| // ----------- S t a t e -------------
|
| // -- r0 : receiver
|
| // -- r2 : name
|
| @@ -28,11 +29,15 @@ void NamedLoadHandlerCompiler::GenerateLoadViaGetter(
|
| FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
|
|
|
| if (accessor_index >= 0) {
|
| + DCHECK(!holder.is(scratch));
|
| + DCHECK(!receiver.is(scratch));
|
| // Call the JavaScript getter with the receiver on the stack.
|
| if (IC::TypeToMap(*type, masm->isolate())->IsJSGlobalObjectMap()) {
|
| // Swap in the global receiver.
|
| - __ ldr(receiver,
|
| + // Do not overwrite receiver register, it can alias to holder register.
|
| + __ ldr(scratch,
|
| FieldMemOperand(receiver, JSGlobalObject::kGlobalProxyOffset));
|
| + receiver = scratch;
|
| }
|
| __ push(receiver);
|
| ParameterCount actual(0);
|
| @@ -54,7 +59,8 @@ void NamedLoadHandlerCompiler::GenerateLoadViaGetter(
|
|
|
| void NamedStoreHandlerCompiler::GenerateStoreViaSetter(
|
| MacroAssembler* masm, Handle<HeapType> type, Register receiver,
|
| - Register holder, int accessor_index, int expected_arguments) {
|
| + Register holder, int accessor_index, int expected_arguments,
|
| + Register scratch) {
|
| // ----------- S t a t e -------------
|
| // -- lr : return address
|
| // -----------------------------------
|
| @@ -65,11 +71,16 @@ void NamedStoreHandlerCompiler::GenerateStoreViaSetter(
|
| __ push(value());
|
|
|
| if (accessor_index >= 0) {
|
| + DCHECK(!holder.is(scratch));
|
| + DCHECK(!receiver.is(scratch));
|
| + DCHECK(!value().is(scratch));
|
| // Call the JavaScript setter with receiver and value on the stack.
|
| if (IC::TypeToMap(*type, masm->isolate())->IsJSGlobalObjectMap()) {
|
| // Swap in the global receiver.
|
| - __ ldr(receiver,
|
| + // Do not overwrite receiver register, it can alias to holder register.
|
| + __ ldr(scratch,
|
| FieldMemOperand(receiver, JSGlobalObject::kGlobalProxyOffset));
|
| + receiver = scratch;
|
| }
|
| __ Push(receiver, value());
|
| ParameterCount actual(1);
|
|
|