| 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 90686a79d2d9ae2f97fbf8304c794a3e7d6a2cbc..942d5652661f9b3ad9b7006b39117cdafaef280e 100644
|
| --- a/src/compiler/arm64/code-generator-arm64.cc
|
| +++ b/src/compiler/arm64/code-generator-arm64.cc
|
| @@ -458,15 +458,24 @@ Condition FlagsConditionToCondition(FlagsCondition condition) {
|
|
|
|
|
| void CodeGenerator::AssembleDeconstructActivationRecord(int stack_param_delta) {
|
| + int sp_slot_delta = TailCallFrameStackSlotDelta(stack_param_delta);
|
| + if (sp_slot_delta > 0) {
|
| + __ Add(jssp, jssp, Operand(sp_slot_delta * kPointerSize));
|
| + }
|
| CallDescriptor* descriptor = linkage()->GetIncomingDescriptor();
|
| - int stack_slots = frame()->GetSpillSlotCount();
|
| - if (descriptor->IsJSFunctionCall() || stack_slots > 0) {
|
| - __ Mov(jssp, fp);
|
| + int spill_slots = frame()->GetSpillSlotCount();
|
| + bool has_frame = descriptor->IsJSFunctionCall() || spill_slots > 0;
|
| + if (has_frame) {
|
| __ Pop(fp, lr);
|
| }
|
| - if (stack_param_delta < 0) {
|
| - int offset = -stack_param_delta * kPointerSize;
|
| - __ Add(jssp, jssp, Operand(offset));
|
| +}
|
| +
|
| +
|
| +void CodeGenerator::AssemblePrepareTailCall(int stack_param_delta) {
|
| + int sp_slot_delta = TailCallFrameStackSlotDelta(stack_param_delta);
|
| + if (sp_slot_delta < 0) {
|
| + __ Sub(jssp, jssp, Operand(-sp_slot_delta * kPointerSize));
|
| + frame()->AllocateOutgoingParameterSlots(-sp_slot_delta);
|
| }
|
| }
|
|
|
| @@ -549,6 +558,9 @@ void CodeGenerator::AssembleArchInstruction(Instruction* instr) {
|
| // guarantee correct alignment of stack pointer.
|
| UNREACHABLE();
|
| break;
|
| + case kArchPrepareTailCall:
|
| + AssemblePrepareTailCall(i.InputInt32(instr->InputCount() - 1));
|
| + break;
|
| case kArchCallCFunction: {
|
| int const num_parameters = MiscField::decode(instr->opcode());
|
| if (instr->InputAt(0)->IsImmediate()) {
|
|
|