Index: src/x64/code-stubs-x64.cc |
diff --git a/src/x64/code-stubs-x64.cc b/src/x64/code-stubs-x64.cc |
index b28e53bd9835542dd1c81926fff69cb6177d9133..978598e3a845ccc7a47fa17c210b40826cdd5bd9 100644 |
--- a/src/x64/code-stubs-x64.cc |
+++ b/src/x64/code-stubs-x64.cc |
@@ -5365,11 +5365,10 @@ static void CallApiFunctionAndReturn(MacroAssembler* masm, |
__ jmp(&leave_exit_frame); |
} |
- |
static void CallApiFunctionStubHelper(MacroAssembler* masm, |
const ParameterCount& argc, |
bool return_first_arg, |
- bool call_data_undefined) { |
+ bool call_data_undefined, bool is_lazy) { |
// ----------- S t a t e ------------- |
// -- rdi : callee |
// -- rbx : call_data |
@@ -5432,8 +5431,10 @@ static void CallApiFunctionStubHelper(MacroAssembler* masm, |
// Push return address back on stack. |
__ PushReturnAddressFrom(return_address); |
- // load context from callee |
- __ movp(context, FieldOperand(callee, JSFunction::kContextOffset)); |
+ if (!is_lazy) { |
+ // load context from callee |
+ __ movp(context, FieldOperand(callee, JSFunction::kContextOffset)); |
+ } |
// Allocate the v8::Arguments structure in the arguments' space since |
// it's not controlled by GC. |
@@ -5506,7 +5507,7 @@ static void CallApiFunctionStubHelper(MacroAssembler* masm, |
void CallApiFunctionStub::Generate(MacroAssembler* masm) { |
bool call_data_undefined = this->call_data_undefined(); |
CallApiFunctionStubHelper(masm, ParameterCount(rax), false, |
- call_data_undefined); |
+ call_data_undefined, false); |
} |
@@ -5514,8 +5515,9 @@ void CallApiAccessorStub::Generate(MacroAssembler* masm) { |
bool is_store = this->is_store(); |
int argc = this->argc(); |
bool call_data_undefined = this->call_data_undefined(); |
+ bool is_lazy = this->is_lazy(); |
CallApiFunctionStubHelper(masm, ParameterCount(argc), is_store, |
- call_data_undefined); |
+ call_data_undefined, is_lazy); |
} |