Index: src/x87/code-stubs-x87.cc |
diff --git a/src/x87/code-stubs-x87.cc b/src/x87/code-stubs-x87.cc |
index fc8387364e249f73d0c962f9bd9bb1df765b8d7e..fbf3862dee70df47fa0b7455b5753f7b51b09431 100644 |
--- a/src/x87/code-stubs-x87.cc |
+++ b/src/x87/code-stubs-x87.cc |
@@ -5215,11 +5215,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 |
@@ -5293,8 +5292,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 |
@@ -5366,7 +5367,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); |
} |
@@ -5374,8 +5375,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); |
} |