Chromium Code Reviews| Index: src/x64/code-stubs-x64.cc |
| diff --git a/src/x64/code-stubs-x64.cc b/src/x64/code-stubs-x64.cc |
| index 84630928d49ee3a256af73a9a2268d49e029d49c..e2b7b96689d467e1e85004288907283927381c49 100644 |
| --- a/src/x64/code-stubs-x64.cc |
| +++ b/src/x64/code-stubs-x64.cc |
| @@ -2755,15 +2755,20 @@ void CallApiCallbackStub::Generate(MacroAssembler* masm) { |
| // holder |
| __ Push(holder); |
| - __ movp(scratch, rsp); |
| - // Push return address back on stack. |
| - __ PushReturnAddressFrom(return_address); |
| - |
| - if (!this->is_lazy()) { |
| + if (this->is_lazy()) { |
|
jochen (gone - plz use gerrit)
2017/06/14 09:26:01
maybe we can just enter the correct context before
Yuki
2017/06/14 13:34:52
I gave it a shot in PS8, but I failed so far. Cou
|
| + // load context from holder |
| + __ movp(scratch, FieldOperand(holder, HeapObject::kMapOffset)); |
| + __ GetMapConstructor(scratch, scratch, context); |
| + __ movp(context, FieldOperand(scratch, JSFunction::kContextOffset)); |
| + } else { |
| // load context from callee |
| __ movp(context, FieldOperand(callee, JSFunction::kContextOffset)); |
| } |
| + __ movp(scratch, rsp); |
| + // Push return address back on stack. |
| + __ PushReturnAddressFrom(return_address); |
| + |
| // Allocate the v8::Arguments structure in the arguments' space since |
| // it's not controlled by GC. |
| const int kApiStackSpace = 3; |