| 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 88189aa31e65ad36a9a5a0d769f806ac75ce5e76..9a774e85086343bd923dda223db9f2242a758ee1 100644
|
| --- a/src/ic/arm/handler-compiler-arm.cc
|
| +++ b/src/ic/arm/handler-compiler-arm.cc
|
| @@ -37,12 +37,7 @@ void NamedLoadHandlerCompiler::GenerateLoadViaGetter(
|
| __ push(receiver);
|
| ParameterCount actual(0);
|
| ParameterCount expected(expected_arguments);
|
| - Register scratch = holder;
|
| - __ ldr(scratch, FieldMemOperand(holder, HeapObject::kMapOffset));
|
| - __ LoadInstanceDescriptors(scratch, scratch);
|
| - __ ldr(scratch, FieldMemOperand(scratch, DescriptorArray::GetValueOffset(
|
| - accessor_index)));
|
| - __ ldr(r1, FieldMemOperand(scratch, AccessorPair::kGetterOffset));
|
| + __ LoadAccessor(r1, holder, accessor_index, ACCESSOR_GETTER);
|
| __ InvokeFunction(r1, expected, actual, CALL_FUNCTION, NullCallWrapper());
|
| } else {
|
| // If we generate a global code snippet for deoptimization only, remember
|
| @@ -79,12 +74,7 @@ void NamedStoreHandlerCompiler::GenerateStoreViaSetter(
|
| __ Push(receiver, value());
|
| ParameterCount actual(1);
|
| ParameterCount expected(expected_arguments);
|
| - Register scratch = holder;
|
| - __ ldr(scratch, FieldMemOperand(holder, HeapObject::kMapOffset));
|
| - __ LoadInstanceDescriptors(scratch, scratch);
|
| - __ ldr(scratch, FieldMemOperand(scratch, DescriptorArray::GetValueOffset(
|
| - accessor_index)));
|
| - __ ldr(r1, FieldMemOperand(scratch, AccessorPair::kSetterOffset));
|
| + __ LoadAccessor(r1, holder, accessor_index, ACCESSOR_SETTER);
|
| __ InvokeFunction(r1, expected, actual, CALL_FUNCTION, NullCallWrapper());
|
| } else {
|
| // If we generate a global code snippet for deoptimization only, remember
|
|
|