| Index: src/compiler/s390/code-generator-s390.cc
|
| diff --git a/src/compiler/s390/code-generator-s390.cc b/src/compiler/s390/code-generator-s390.cc
|
| index 697005830774f8b23f6ca5eeba73c01a25e23516..a4171980aefff7b41bb54f16734daf394d36f207 100644
|
| --- a/src/compiler/s390/code-generator-s390.cc
|
| +++ b/src/compiler/s390/code-generator-s390.cc
|
| @@ -924,8 +924,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.
|
| @@ -934,11 +933,9 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
|
| __ CmpP(cp, kScratchReg);
|
| __ Assert(eq, kWrongFunctionContext);
|
| }
|
| - if (opcode == kArchTailCallJSFunctionFromJSFunction) {
|
| - AssemblePopArgumentsAdaptorFrame(kJavaScriptCallArgCountRegister,
|
| - i.TempRegister(0), i.TempRegister(1),
|
| - i.TempRegister(2));
|
| - }
|
| + AssemblePopArgumentsAdaptorFrame(kJavaScriptCallArgCountRegister,
|
| + i.TempRegister(0), i.TempRegister(1),
|
| + i.TempRegister(2));
|
| __ LoadP(ip, FieldMemOperand(func, JSFunction::kCodeEntryOffset));
|
| __ Jump(ip);
|
| frame_access_state()->ClearSPDelta();
|
|
|