| Index: src/compiler/arm/code-generator-arm.cc
|
| diff --git a/src/compiler/arm/code-generator-arm.cc b/src/compiler/arm/code-generator-arm.cc
|
| index e969f02e1f5dfeb727118057fcdbb4162b1e7e22..8d409d3e37644fd82db482a023a24fce24061b65 100644
|
| --- a/src/compiler/arm/code-generator-arm.cc
|
| +++ b/src/compiler/arm/code-generator-arm.cc
|
| @@ -679,8 +679,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.
|
| @@ -688,11 +687,9 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
|
| __ cmp(cp, kScratchReg);
|
| __ Assert(eq, 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));
|
| __ ldr(ip, FieldMemOperand(func, JSFunction::kCodeEntryOffset));
|
| __ Jump(ip);
|
| DCHECK_EQ(LeaveCC, i.OutputSBit());
|
|
|