Index: src/compiler/arm64/code-generator-arm64.cc |
diff --git a/src/compiler/arm64/code-generator-arm64.cc b/src/compiler/arm64/code-generator-arm64.cc |
index 73837a40e72646b420d13932dfec5e97fab28726..40e7209a20afcf3a19e708dfa146f5582be3874b 100644 |
--- a/src/compiler/arm64/code-generator-arm64.cc |
+++ b/src/compiler/arm64/code-generator-arm64.cc |
@@ -541,21 +541,7 @@ void CodeGenerator::AssembleDeconstructFrame() { |
__ Pop(fp, lr); |
} |
-void CodeGenerator::AssembleDeconstructActivationRecord(int stack_param_delta) { |
- int sp_slot_delta = TailCallFrameStackSlotDelta(stack_param_delta); |
- if (sp_slot_delta > 0) { |
- __ Drop(sp_slot_delta); |
- } |
- frame_access_state()->SetFrameAccessToDefault(); |
-} |
- |
- |
-void CodeGenerator::AssemblePrepareTailCall(int stack_param_delta) { |
- int sp_slot_delta = TailCallFrameStackSlotDelta(stack_param_delta); |
- if (sp_slot_delta < 0) { |
- __ Claim(-sp_slot_delta); |
- frame_access_state()->IncreaseSPDelta(-sp_slot_delta); |
- } |
+void CodeGenerator::AssemblePrepareTailCall() { |
if (frame_access_state()->has_frame()) { |
__ Ldr(lr, MemOperand(fp, StandardFrameConstants::kCallerPCOffset)); |
__ Ldr(fp, MemOperand(fp, StandardFrameConstants::kCallerFPOffset)); |
@@ -588,6 +574,38 @@ void CodeGenerator::AssemblePopArgumentsAdaptorFrame(Register args_reg, |
__ bind(&done); |
} |
+namespace { |
+ |
+void AdjustStackPointerForTailCall(MacroAssembler* masm, |
+ FrameAccessState* state, |
+ int new_slot_above_sp, |
+ bool allow_shrinkage = true) { |
+ int current_sp_offset = state->GetSPToFPSlotCount() + |
+ StandardFrameConstants::kFixedSlotCountAboveFp; |
+ int stack_slot_delta = new_slot_above_sp - current_sp_offset; |
+ if (stack_slot_delta > 0) { |
+ masm->Claim(stack_slot_delta); |
+ state->IncreaseSPDelta(stack_slot_delta); |
+ } else if (allow_shrinkage && stack_slot_delta < 0) { |
+ masm->Drop(-stack_slot_delta); |
+ state->IncreaseSPDelta(stack_slot_delta); |
+ } |
+} |
+ |
+} // namespace |
+ |
+void CodeGenerator::AssembleTailCallBeforeGap(Instruction* instr, |
+ int first_unused_stack_slot) { |
+ AdjustStackPointerForTailCall(masm(), frame_access_state(), |
+ first_unused_stack_slot, false); |
+} |
+ |
+void CodeGenerator::AssembleTailCallAfterGap(Instruction* instr, |
+ int first_unused_stack_slot) { |
+ AdjustStackPointerForTailCall(masm(), frame_access_state(), |
+ first_unused_stack_slot); |
+} |
+ |
// Assembles an instruction after register allocation, producing machine code. |
CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction( |
Instruction* instr) { |
@@ -623,8 +641,6 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction( |
} |
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), |
@@ -639,14 +655,14 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction( |
__ Jump(target); |
} |
frame_access_state()->ClearSPDelta(); |
+ frame_access_state()->SetFrameAccessToDefault(); |
break; |
} |
case kArchTailCallAddress: { |
- int stack_param_delta = i.InputInt32(instr->InputCount() - 1); |
- AssembleDeconstructActivationRecord(stack_param_delta); |
CHECK(!instr->InputAt(0)->IsImmediate()); |
__ Jump(i.InputRegister(0)); |
frame_access_state()->ClearSPDelta(); |
+ frame_access_state()->SetFrameAccessToDefault(); |
break; |
} |
case kArchCallJSFunction: { |
@@ -689,8 +705,6 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction( |
__ cmp(cp, temp); |
__ Assert(eq, kWrongFunctionContext); |
} |
- 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), |
@@ -699,6 +713,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction( |
__ Ldr(x10, FieldMemOperand(func, JSFunction::kCodeEntryOffset)); |
__ Jump(x10); |
frame_access_state()->ClearSPDelta(); |
+ frame_access_state()->SetFrameAccessToDefault(); |
break; |
} |
case kArchPrepareCallCFunction: |
@@ -708,7 +723,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction( |
UNREACHABLE(); |
break; |
case kArchPrepareTailCall: |
- AssemblePrepareTailCall(i.InputInt32(instr->InputCount() - 1)); |
+ AssemblePrepareTailCall(); |
break; |
case kArchCallCFunction: { |
int const num_parameters = MiscField::decode(instr->opcode()); |