Index: src/arm/code-stubs-arm.cc |
diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc |
index 5c15805663033a23188e3138b6de58b1e705a5d4..7c991afddf1aa5ad2636bfc17094a8ef3c7b9b61 100644 |
--- a/src/arm/code-stubs-arm.cc |
+++ b/src/arm/code-stubs-arm.cc |
@@ -5375,11 +5375,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 ------------- |
// -- r0 : callee |
// -- r4 : call_data |
@@ -5415,8 +5414,10 @@ static void CallApiFunctionStubHelper(MacroAssembler* masm, |
// context save |
__ push(context); |
- // load context from callee |
- __ ldr(context, FieldMemOperand(callee, JSFunction::kContextOffset)); |
+ if (!is_lazy) { |
+ // load context from callee |
+ __ ldr(context, FieldMemOperand(callee, JSFunction::kContextOffset)); |
+ } |
// callee |
__ push(callee); |
@@ -5508,7 +5509,7 @@ static void CallApiFunctionStubHelper(MacroAssembler* masm, |
void CallApiFunctionStub::Generate(MacroAssembler* masm) { |
bool call_data_undefined = this->call_data_undefined(); |
CallApiFunctionStubHelper(masm, ParameterCount(r3), false, |
- call_data_undefined); |
+ call_data_undefined, false); |
} |
@@ -5516,8 +5517,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); |
} |