| Index: src/ia32/code-stubs-ia32.cc
|
| diff --git a/src/ia32/code-stubs-ia32.cc b/src/ia32/code-stubs-ia32.cc
|
| index 231048105c16946b8e482163e14bec3e838c52d3..8581d7231267cea6730dd55c94da963a0cda895c 100644
|
| --- a/src/ia32/code-stubs-ia32.cc
|
| +++ b/src/ia32/code-stubs-ia32.cc
|
| @@ -2688,6 +2688,7 @@ void CallApiCallbackStub::Generate(MacroAssembler* masm) {
|
| // -- ...
|
| // -- esp[argc * 4] : first argument
|
| // -- esp[(argc + 1) * 4] : receiver
|
| + // -- esp[(argc + 2) * 4] : accessor_holder
|
| // -----------------------------------
|
|
|
| Register callee = edi;
|
| @@ -2732,17 +2733,26 @@ void CallApiCallbackStub::Generate(MacroAssembler* masm) {
|
| // holder
|
| __ push(holder);
|
|
|
| + // enter a new context
|
| Register scratch = call_data;
|
| + if (is_lazy()) {
|
| + // load context from accessor_holder
|
| + Register accessor_holder = context;
|
| + __ mov(accessor_holder,
|
| + MemOperand(esp, (argc() + FCA::kArgsLength + 1) * kPointerSize));
|
| + __ mov(scratch, FieldOperand(accessor_holder, HeapObject::kMapOffset));
|
| + __ GetMapConstructor(scratch, scratch, context);
|
| + __ mov(context, FieldOperand(scratch, JSFunction::kContextOffset));
|
| + } else {
|
| + // load context from callee
|
| + __ mov(context, FieldOperand(callee, JSFunction::kContextOffset));
|
| + }
|
| +
|
| __ mov(scratch, esp);
|
|
|
| // push return address
|
| __ push(return_address);
|
|
|
| - 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
|
| // address of the callback as additional parameter, always allocate
|
| @@ -2780,11 +2790,8 @@ void CallApiCallbackStub::Generate(MacroAssembler* masm) {
|
| return_value_offset = 2 + FCA::kReturnValueOffset;
|
| }
|
| Operand return_value_operand(ebp, return_value_offset * kPointerSize);
|
| - int stack_space = 0;
|
| - Operand length_operand = ApiParameterOperand(4);
|
| - Operand* stack_space_operand = &length_operand;
|
| - stack_space = argc() + FCA::kArgsLength + 1;
|
| - stack_space_operand = nullptr;
|
| + const int stack_space = argc() + FCA::kArgsLength + 2;
|
| + Operand* stack_space_operand = nullptr;
|
| CallApiFunctionAndReturn(masm, api_function_address, thunk_ref,
|
| ApiParameterOperand(1), stack_space,
|
| stack_space_operand, return_value_operand,
|
|
|