Index: src/arm/code-stubs-arm.cc |
diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc |
index 6357ee35bd65d225b952d20deafaad4586543bfe..546ce0c89b7b617806d052ba1083f8965f51e0b1 100644 |
--- a/src/arm/code-stubs-arm.cc |
+++ b/src/arm/code-stubs-arm.cc |
@@ -5261,11 +5261,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 |
@@ -5301,8 +5300,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); |
@@ -5394,7 +5395,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); |
} |
@@ -5402,8 +5403,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); |
} |