| Index: src/x64/stub-cache-x64.cc
|
| diff --git a/src/x64/stub-cache-x64.cc b/src/x64/stub-cache-x64.cc
|
| index 55e4a9b129556c070cfc8a3e39b1d9f6bc777864..1a4d889c6c9f26c8089701a2930a27e387670ecf 100644
|
| --- a/src/x64/stub-cache-x64.cc
|
| +++ b/src/x64/stub-cache-x64.cc
|
| @@ -1191,7 +1191,7 @@ Register BaseLoadStubCompiler::CallbackHandlerFrontend(
|
| Handle<JSObject> holder,
|
| Handle<Name> name,
|
| Label* success,
|
| - Handle<ExecutableAccessorInfo> callback) {
|
| + Handle<Object> callback) {
|
| Label miss;
|
|
|
| Register reg = HandlerFrontendHeader(object, object_reg, holder, name, &miss);
|
| @@ -1277,6 +1277,35 @@ void BaseLoadStubCompiler::GenerateLoadField(Register reg,
|
|
|
| void BaseLoadStubCompiler::GenerateLoadCallback(
|
| Register reg,
|
| + const CallOptimization& call_optimization) {
|
| + ASSERT(call_optimization.is_simple_api_call());
|
| + ASSERT(!scratch3().is(reg));
|
| + ASSERT(!receiver().is(reg));
|
| +
|
| + // copy return value
|
| + __ movq(scratch3(), StackSpaceOperand(0));
|
| + // assign stack space for the call arguments
|
| + __ subq(rsp, Immediate((kFastApiCallArguments + 1) * kPointerSize));
|
| + // Move the return address on top of the stack.
|
| + __ movq(StackOperandForReturnAddress(0), scratch3());
|
| +
|
| + int argc = 0;
|
| + int api_call_argc = argc + kFastApiCallArguments;
|
| + StackArgumentsAccessor args(rsp, api_call_argc);
|
| + // write holder to stack frame
|
| + Register holder =
|
| + call_optimization.expected_receiver_type().is_null() ?
|
| + receiver() : reg;
|
| + __ movq(args.GetArgumentOperand(api_call_argc), holder);
|
| + // write receiver to stack frame
|
| + __ movq(args.GetArgumentOperand(api_call_argc - (argc + 6)), receiver());
|
| +
|
| + GenerateFastApiCall(masm(), call_optimization, argc);
|
| +}
|
| +
|
| +
|
| +void BaseLoadStubCompiler::GenerateLoadCallback(
|
| + Register reg,
|
| Handle<ExecutableAccessorInfo> callback) {
|
| // Insert additional parameters into the stack frame above return address.
|
| ASSERT(!scratch4().is(reg));
|
|
|