| Index: src/compiler/x87/code-generator-x87.cc
|
| diff --git a/src/compiler/x87/code-generator-x87.cc b/src/compiler/x87/code-generator-x87.cc
|
| index b7c00ba767af287390ac924fb6c0cc90b5fe1727..74d9b74b558bbfc41a6b79d077559ca5c4e401b6 100644
|
| --- a/src/compiler/x87/code-generator-x87.cc
|
| +++ b/src/compiler/x87/code-generator-x87.cc
|
| @@ -637,8 +637,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
|
| frame_access_state()->ClearSPDelta();
|
| break;
|
| }
|
| - case kArchTailCallJSFunctionFromJSFunction:
|
| - case kArchTailCallJSFunction: {
|
| + case kArchTailCallJSFunctionFromJSFunction: {
|
| Register func = i.InputRegister(0);
|
| if (FLAG_debug_code) {
|
| // Check the function's context matches the context argument.
|
| @@ -649,10 +648,8 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
|
| __ VerifyX87StackDepth(1);
|
| }
|
| __ fstp(0);
|
| - if (arch_opcode == kArchTailCallJSFunctionFromJSFunction) {
|
| - AssemblePopArgumentsAdaptorFrame(kJavaScriptCallArgCountRegister,
|
| - no_reg, no_reg, no_reg);
|
| - }
|
| + AssemblePopArgumentsAdaptorFrame(kJavaScriptCallArgCountRegister, no_reg,
|
| + no_reg, no_reg);
|
| __ jmp(FieldOperand(func, JSFunction::kCodeEntryOffset));
|
| frame_access_state()->ClearSPDelta();
|
| frame_access_state()->SetFrameAccessToDefault();
|
|
|