| Index: src/s390/builtins-s390.cc
|
| diff --git a/src/s390/builtins-s390.cc b/src/s390/builtins-s390.cc
|
| index f515e5d151f34468effde29a0ae4da8d5b84ca7b..2b3aebaa7eedea9ba199e0fbb353a0b5b13aa7d8 100644
|
| --- a/src/s390/builtins-s390.cc
|
| +++ b/src/s390/builtins-s390.cc
|
| @@ -1205,7 +1205,8 @@ static void Generate_InterpreterPushArgs(MacroAssembler* masm, Register index,
|
|
|
| // 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 -------------
|
| // -- r2 : the number of arguments (not including the receiver)
|
| // -- r4 : the address of the first argument to be pushed. Subsequent
|
| @@ -1221,9 +1222,16 @@ void Builtins::Generate_InterpreterPushArgsAndCallImpl(
|
| Generate_InterpreterPushArgs(masm, r4, r5, r6);
|
|
|
| // Call the target.
|
| - __ 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
|
|
|