| Index: src/x87/code-stubs-x87.cc
|
| diff --git a/src/x87/code-stubs-x87.cc b/src/x87/code-stubs-x87.cc
|
| index 1ee8484452be9e440306e3711368f12659291d97..5162d0a6b1c970d2de01489962579f53bc4b90c4 100644
|
| --- a/src/x87/code-stubs-x87.cc
|
| +++ b/src/x87/code-stubs-x87.cc
|
| @@ -5210,11 +5210,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 -------------
|
| // -- edi : callee
|
| // -- ebx : call_data
|
| @@ -5288,8 +5287,10 @@ static void CallApiFunctionStubHelper(MacroAssembler* masm,
|
| // push return address
|
| __ push(return_address);
|
|
|
| - // load context from callee
|
| - __ mov(context, FieldOperand(callee, JSFunction::kContextOffset));
|
| + if (!is_lazy) {
|
| + // load context from callee
|
| + __ mov(context, FieldOperand(callee, JSFunction::kContextOffset));
|
| + }
|
|
|
| // API function gets reference to the v8::Arguments. If CPU profiler
|
| // is enabled wrapper function will be called and we need to pass
|
| @@ -5361,7 +5362,7 @@ static void CallApiFunctionStubHelper(MacroAssembler* masm,
|
| void CallApiFunctionStub::Generate(MacroAssembler* masm) {
|
| bool call_data_undefined = this->call_data_undefined();
|
| CallApiFunctionStubHelper(masm, ParameterCount(eax), false,
|
| - call_data_undefined);
|
| + call_data_undefined, false);
|
| }
|
|
|
|
|
| @@ -5369,8 +5370,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);
|
| }
|
|
|
|
|
|
|