Index: src/builtins/s390/builtins-s390.cc |
diff --git a/src/builtins/s390/builtins-s390.cc b/src/builtins/s390/builtins-s390.cc |
index 11b81b7e941956287c6c1053a16187f60bbd98ed..96de7a4d936d89b79d4d7935998e6f8417e51ef9 100644 |
--- a/src/builtins/s390/builtins-s390.cc |
+++ b/src/builtins/s390/builtins-s390.cc |
@@ -1170,7 +1170,7 @@ static void Generate_InterpreterPushArgs(MacroAssembler* masm, |
// static |
void Builtins::Generate_InterpreterPushArgsAndCallImpl( |
MacroAssembler* masm, TailCallMode tail_call_mode, |
- CallableType function_type) { |
+ InterpreterPushArgsMode mode) { |
// ----------- 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 |
@@ -1187,12 +1187,12 @@ void Builtins::Generate_InterpreterPushArgsAndCallImpl( |
Generate_InterpreterPushArgs(masm, r5, r4, r5, r6, &stack_overflow); |
// Call the target. |
- if (function_type == CallableType::kJSFunction) { |
+ if (mode == InterpreterPushArgsMode::kJSFunction) { |
__ Jump(masm->isolate()->builtins()->CallFunction(ConvertReceiverMode::kAny, |
tail_call_mode), |
RelocInfo::CODE_TARGET); |
} else { |
- DCHECK_EQ(function_type, CallableType::kAny); |
+ DCHECK_EQ(mode, InterpreterPushArgsMode::kOther); |
__ Jump(masm->isolate()->builtins()->Call(ConvertReceiverMode::kAny, |
tail_call_mode), |
RelocInfo::CODE_TARGET); |
@@ -1208,7 +1208,7 @@ void Builtins::Generate_InterpreterPushArgsAndCallImpl( |
// static |
void Builtins::Generate_InterpreterPushArgsAndConstructImpl( |
- MacroAssembler* masm, PushArgsConstructMode mode) { |
+ MacroAssembler* masm, InterpreterPushArgsMode mode) { |
// ----------- S t a t e ------------- |
// -- r2 : argument count (not including receiver) |
// -- r5 : new target |
@@ -1230,7 +1230,7 @@ void Builtins::Generate_InterpreterPushArgsAndConstructImpl( |
__ bind(&skip); |
__ AssertUndefinedOrAllocationSite(r4, r7); |
- if (mode == PushArgsConstructMode::kJSFunction) { |
+ if (mode == InterpreterPushArgsMode::kJSFunction) { |
__ AssertFunction(r3); |
// Tail call to the function-specific construct stub (still in the caller |
@@ -1240,12 +1240,12 @@ void Builtins::Generate_InterpreterPushArgsAndConstructImpl( |
// Jump to the construct function. |
__ AddP(ip, r6, Operand(Code::kHeaderSize - kHeapObjectTag)); |
__ Jump(ip); |
- } else if (mode == PushArgsConstructMode::kWithFinalSpread) { |
+ } else if (mode == InterpreterPushArgsMode::kWithFinalSpread) { |
// Call the constructor with r2, r3, and r5 unmodified. |
__ Jump(masm->isolate()->builtins()->ConstructWithSpread(), |
RelocInfo::CODE_TARGET); |
} else { |
- DCHECK_EQ(PushArgsConstructMode::kOther, mode); |
+ DCHECK_EQ(InterpreterPushArgsMode::kOther, mode); |
// Call the constructor with r2, r3, and r5 unmodified. |
__ Jump(masm->isolate()->builtins()->Construct(), RelocInfo::CODE_TARGET); |
} |