| Index: src/compiler/x64/code-generator-x64.cc
|
| diff --git a/src/compiler/x64/code-generator-x64.cc b/src/compiler/x64/code-generator-x64.cc
|
| index a5212cb75ef3389c85012077076569850cd0999f..0c2412fc5cfeaf7863f3dbe4491c50386afdf66c 100644
|
| --- a/src/compiler/x64/code-generator-x64.cc
|
| +++ b/src/compiler/x64/code-generator-x64.cc
|
| @@ -848,19 +848,16 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
|
| RecordCallPosition(instr);
|
| 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.
|
| __ cmpp(rsi, FieldOperand(func, JSFunction::kContextOffset));
|
| __ Assert(equal, kWrongFunctionContext);
|
| }
|
| - if (arch_opcode == kArchTailCallJSFunctionFromJSFunction) {
|
| - AssemblePopArgumentsAdaptorFrame(kJavaScriptCallArgCountRegister,
|
| - i.TempRegister(0), i.TempRegister(1),
|
| - i.TempRegister(2));
|
| - }
|
| + AssemblePopArgumentsAdaptorFrame(kJavaScriptCallArgCountRegister,
|
| + i.TempRegister(0), i.TempRegister(1),
|
| + i.TempRegister(2));
|
| __ jmp(FieldOperand(func, JSFunction::kCodeEntryOffset));
|
| frame_access_state()->ClearSPDelta();
|
| frame_access_state()->SetFrameAccessToDefault();
|
|
|