| Index: src/x64/builtins-x64.cc
|
| diff --git a/src/x64/builtins-x64.cc b/src/x64/builtins-x64.cc
|
| index 326019e6f7476711de5113b2a8c197332447e7a7..c022e90521f5fa071ee63c1a3667099227b69b4a 100644
|
| --- a/src/x64/builtins-x64.cc
|
| +++ b/src/x64/builtins-x64.cc
|
| @@ -822,7 +822,8 @@ static void Generate_InterpreterPushArgs(MacroAssembler* masm,
|
|
|
| // static
|
| void Builtins::Generate_InterpreterPushArgsAndCallImpl(
|
| - MacroAssembler* masm, TailCallMode tail_call_mode) {
|
| + MacroAssembler* masm, TailCallMode tail_call_mode,
|
| + CallableType function_type) {
|
| // ----------- S t a t e -------------
|
| // -- rax : the number of arguments (not including the receiver)
|
| // -- rbx : the address of the first argument to be pushed. Subsequent
|
| @@ -838,9 +839,17 @@ void Builtins::Generate_InterpreterPushArgsAndCallImpl(
|
|
|
| // Call the target.
|
| __ PushReturnAddressFrom(kScratchRegister); // Re-push return address.
|
| - __ Jump(masm->isolate()->builtins()->Call(ConvertReceiverMode::kAny,
|
| - tail_call_mode),
|
| - RelocInfo::CODE_TARGET);
|
| +
|
| + if (function_type == CallableType::kJSFunction) {
|
| + __ Jump(masm->isolate()->builtins()->CallFunction(ConvertReceiverMode::kAny,
|
| + tail_call_mode),
|
| + RelocInfo::CODE_TARGET);
|
| + } else {
|
| + DCHECK_EQ(function_type, CallableType::kAny);
|
| + __ Jump(masm->isolate()->builtins()->Call(ConvertReceiverMode::kAny,
|
| + tail_call_mode),
|
| + RelocInfo::CODE_TARGET);
|
| + }
|
| }
|
|
|
| // static
|
|
|