Index: src/compiler/mips/code-generator-mips.cc |
diff --git a/src/compiler/mips/code-generator-mips.cc b/src/compiler/mips/code-generator-mips.cc |
index cdd7e3486672c63a572e3972ed7b2a6fbccc0aa4..4ca558624963e957411d990a6e5f27d0c8cc8be0 100644 |
--- a/src/compiler/mips/code-generator-mips.cc |
+++ b/src/compiler/mips/code-generator-mips.cc |
@@ -489,13 +489,37 @@ void CodeGenerator::AssemblePrepareTailCall(int stack_param_delta) { |
frame_access_state()->SetFrameAccessToSP(); |
} |
+void CodeGenerator::AssemblePopArgumentsAdaptorFrame(Register args_reg, |
+ Register scratch1, |
+ Register scratch2, |
+ Register scratch3) { |
+ DCHECK(!AreAliased(args_reg, scratch1, scratch2, scratch3)); |
+ Label done; |
+ |
+ // Check if current frame is an arguments adaptor frame. |
+ __ lw(scratch1, MemOperand(fp, StandardFrameConstants::kContextOffset)); |
+ __ Branch(&done, ne, scratch1, |
+ Operand(Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR))); |
+ |
+ // Load arguments count from current arguments adaptor frame (note, it |
+ // does not include receiver). |
+ Register caller_args_count_reg = scratch1; |
+ __ lw(caller_args_count_reg, |
+ MemOperand(fp, ArgumentsAdaptorFrameConstants::kLengthOffset)); |
+ __ SmiUntag(caller_args_count_reg); |
+ |
+ ParameterCount callee_args_count(args_reg); |
+ __ PrepareForTailCall(callee_args_count, caller_args_count_reg, scratch2, |
+ scratch3); |
+ __ bind(&done); |
+} |
// Assembles an instruction after register allocation, producing machine code. |
void CodeGenerator::AssembleArchInstruction(Instruction* instr) { |
MipsOperandConverter i(this, instr); |
InstructionCode opcode = instr->opcode(); |
- |
- switch (ArchOpcodeField::decode(opcode)) { |
+ ArchOpcode arch_opcode = ArchOpcodeField::decode(opcode); |
+ switch (arch_opcode) { |
case kArchCallCodeObject: { |
EnsureSpaceForLazyDeopt(); |
if (instr->InputAt(0)->IsImmediate()) { |
@@ -509,9 +533,15 @@ void CodeGenerator::AssembleArchInstruction(Instruction* instr) { |
frame_access_state()->ClearSPDelta(); |
break; |
} |
+ case kArchTailCallCodeObjectFromJSFunction: |
case kArchTailCallCodeObject: { |
int stack_param_delta = i.InputInt32(instr->InputCount() - 1); |
AssembleDeconstructActivationRecord(stack_param_delta); |
+ if (arch_opcode == kArchTailCallCodeObjectFromJSFunction) { |
+ AssemblePopArgumentsAdaptorFrame(kJavaScriptCallArgCountRegister, |
+ i.TempRegister(0), i.TempRegister(1), |
+ i.TempRegister(2)); |
+ } |
if (instr->InputAt(0)->IsImmediate()) { |
__ Jump(Handle<Code>::cast(i.InputHeapObject(0)), |
RelocInfo::CODE_TARGET); |
@@ -537,6 +567,7 @@ void CodeGenerator::AssembleArchInstruction(Instruction* instr) { |
frame_access_state()->ClearSPDelta(); |
break; |
} |
+ case kArchTailCallJSFunctionFromJSFunction: |
case kArchTailCallJSFunction: { |
Register func = i.InputRegister(0); |
if (FLAG_debug_code) { |
@@ -547,6 +578,11 @@ void CodeGenerator::AssembleArchInstruction(Instruction* instr) { |
int stack_param_delta = i.InputInt32(instr->InputCount() - 1); |
AssembleDeconstructActivationRecord(stack_param_delta); |
+ if (arch_opcode == kArchTailCallJSFunctionFromJSFunction) { |
+ AssemblePopArgumentsAdaptorFrame(kJavaScriptCallArgCountRegister, |
+ i.TempRegister(0), i.TempRegister(1), |
+ i.TempRegister(2)); |
+ } |
__ lw(at, FieldMemOperand(func, JSFunction::kCodeEntryOffset)); |
__ Jump(at); |
frame_access_state()->ClearSPDelta(); |