| Index: src/builtins/x87/builtins-x87.cc
|
| diff --git a/src/builtins/x87/builtins-x87.cc b/src/builtins/x87/builtins-x87.cc
|
| index a3942f8211a8ecec3e7d17ff2d3e45963ed161b5..70a814708176a82ee733290d04eabd97af73d4f8 100644
|
| --- a/src/builtins/x87/builtins-x87.cc
|
| +++ b/src/builtins/x87/builtins-x87.cc
|
| @@ -695,7 +695,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 -------------
|
| // -- eax : the number of arguments (not including the receiver)
|
| // -- ebx : the address of the first argument to be pushed. Subsequent
|
| @@ -727,12 +727,12 @@ void Builtins::Generate_InterpreterPushArgsAndCallImpl(
|
| // Call the target.
|
| __ Push(edx); // Re-push return address.
|
|
|
| - 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);
|
| @@ -845,7 +845,7 @@ void Generate_InterpreterPushArgsAndReturnAddress(
|
|
|
| // static
|
| void Builtins::Generate_InterpreterPushArgsAndConstructImpl(
|
| - MacroAssembler* masm, PushArgsConstructMode mode) {
|
| + MacroAssembler* masm, InterpreterPushArgsMode mode) {
|
| // ----------- S t a t e -------------
|
| // -- eax : the number of arguments (not including the receiver)
|
| // -- edx : the new target
|
| @@ -871,7 +871,7 @@ void Builtins::Generate_InterpreterPushArgsAndConstructImpl(
|
| __ Pop(edi);
|
|
|
| __ AssertUndefinedOrAllocationSite(ebx);
|
| - if (mode == PushArgsConstructMode::kJSFunction) {
|
| + if (mode == InterpreterPushArgsMode::kJSFunction) {
|
| // Tail call to the function-specific construct stub (still in the caller
|
| // context at this point).
|
| __ AssertFunction(edi);
|
| @@ -880,12 +880,12 @@ void Builtins::Generate_InterpreterPushArgsAndConstructImpl(
|
| __ mov(ecx, FieldOperand(ecx, SharedFunctionInfo::kConstructStubOffset));
|
| __ lea(ecx, FieldOperand(ecx, Code::kHeaderSize));
|
| __ jmp(ecx);
|
| - } else if (mode == PushArgsConstructMode::kWithFinalSpread) {
|
| + } else if (mode == InterpreterPushArgsMode::kWithFinalSpread) {
|
| // Call the constructor with unmodified eax, edi, edx values.
|
| __ Jump(masm->isolate()->builtins()->ConstructWithSpread(),
|
| RelocInfo::CODE_TARGET);
|
| } else {
|
| - DCHECK_EQ(PushArgsConstructMode::kOther, mode);
|
| + DCHECK_EQ(InterpreterPushArgsMode::kOther, mode);
|
| // Call the constructor with unmodified eax, edi, edx values.
|
| __ Jump(masm->isolate()->builtins()->Construct(), RelocInfo::CODE_TARGET);
|
| }
|
|
|