Index: src/arm64/code-stubs-arm64.cc |
diff --git a/src/arm64/code-stubs-arm64.cc b/src/arm64/code-stubs-arm64.cc |
index 7e475a1616437bb4d8e9a3b165fd4919196415ff..a88c1803b9c57a75b725287a0913945c12d126e2 100644 |
--- a/src/arm64/code-stubs-arm64.cc |
+++ b/src/arm64/code-stubs-arm64.cc |
@@ -2998,6 +2998,7 @@ void CallApiCallbackStub::Generate(MacroAssembler* masm) { |
// -- ... |
// -- sp[(argc - 1) * 8] : first argument |
// -- sp[argc * 8] : receiver |
+ // -- sp[(argc + 1) * 8] : accessor_holder |
// ----------------------------------- |
Register callee = x0; |
@@ -3026,18 +3027,29 @@ void CallApiCallbackStub::Generate(MacroAssembler* masm) { |
// context, callee and call data. |
__ Push(context, callee, call_data); |
- if (!is_lazy()) { |
- // Load context from callee |
- __ Ldr(context, FieldMemOperand(callee, JSFunction::kContextOffset)); |
- } |
- |
- __ LoadRoot(call_data, Heap::kUndefinedValueRootIndex); |
+ Register scratch = call_data; |
+ __ LoadRoot(scratch, Heap::kUndefinedValueRootIndex); |
Register isolate_reg = x5; |
__ Mov(isolate_reg, ExternalReference::isolate_address(masm->isolate())); |
// FunctionCallbackArguments: |
// return value, return value default, isolate, holder. |
- __ Push(call_data, call_data, isolate_reg, holder); |
+ __ Push(scratch, scratch, isolate_reg, holder); |
+ |
+ // Enter a new context |
+ if (is_lazy()) { |
+ // Load context from accessor_holder |
+ Register accessor_holder = context; |
+ __ Ldr(accessor_holder, |
+ MemOperand(__ StackPointer(), |
+ (FCA::kArgsLength + 1 + argc()) * kPointerSize)); |
+ __ Ldr(scratch, FieldMemOperand(accessor_holder, HeapObject::kMapOffset)); |
+ __ GetMapConstructor(scratch, scratch, context, callee); |
+ __ Ldr(context, FieldMemOperand(scratch, JSFunction::kContextOffset)); |
+ } else { |
+ // Load context from callee |
+ __ Ldr(context, FieldMemOperand(callee, JSFunction::kContextOffset)); |
+ } |
// Prepare arguments. |
Register args = x6; |