Index: src/ic/arm64/handler-compiler-arm64.cc |
diff --git a/src/ic/arm64/handler-compiler-arm64.cc b/src/ic/arm64/handler-compiler-arm64.cc |
index 5de315d2e025891595c184ab4bfd456cac8548bc..2444b6918e502c2d9620f105f3bbdc4229006dc5 100644 |
--- a/src/ic/arm64/handler-compiler-arm64.cc |
+++ b/src/ic/arm64/handler-compiler-arm64.cc |
@@ -243,12 +243,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(x1, FieldMemOperand(scratch, AccessorPair::kSetterOffset)); |
+ __ LoadAccessor(x1, holder, accessor_index, ACCESSOR_SETTER); |
__ InvokeFunction(x1, expected, actual, CALL_FUNCTION, NullCallWrapper()); |
} else { |
// If we generate a global code snippet for deoptimization only, remember |
@@ -282,12 +277,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(x1, FieldMemOperand(scratch, AccessorPair::kGetterOffset)); |
+ __ LoadAccessor(x1, holder, accessor_index, ACCESSOR_GETTER); |
__ InvokeFunction(x1, expected, actual, CALL_FUNCTION, NullCallWrapper()); |
} else { |
// If we generate a global code snippet for deoptimization only, remember |