| 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..ee1315989e0ad1e36458de31757b7e854b981177 100644
|
| --- a/src/compiler/arm64/code-generator-arm64.cc
|
| +++ b/src/compiler/arm64/code-generator-arm64.cc
|
| @@ -459,14 +459,38 @@ Condition FlagsConditionToCondition(FlagsCondition condition) {
|
|
|
| void CodeGenerator::AssembleDeconstructActivationRecord(int stack_param_delta) {
|
| 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) {
|
| + if (stack_param_delta != 0) {
|
| + int total_discarded_slots = frame()->GetTotalFrameSlotCount();
|
| + // Leave the PC and saved frame pointer on the stack.
|
| + total_discarded_slots -=
|
| + StandardFrameConstants::kFixedFrameSizeFromFp / kPointerSize;
|
| + // Discard only slots that won't be used by new parameters.
|
| + total_discarded_slots -= stack_param_delta;
|
| + if (total_discarded_slots > 0) {
|
| + __ Add(jssp, jssp, Operand(total_discarded_slots * kPointerSize));
|
| + }
|
| + } else {
|
| + __ Mov(jssp, fp);
|
| + }
|
| __ 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) {
|
| + if (stack_param_delta > 0) {
|
| + int total_discarded_slots = frame()->GetTotalFrameSlotCount();
|
| + // Leave the PC and saved frame pointer on the stack.
|
| + total_discarded_slots -=
|
| + StandardFrameConstants::kFixedFrameSizeFromFp / kPointerSize;
|
| + // Discard only slots that won't be used by new parameters.
|
| + total_discarded_slots -= stack_param_delta;
|
| + if (total_discarded_slots < 0) {
|
| + __ Sub(jssp, jssp, Operand(-total_discarded_slots * kPointerSize));
|
| + }
|
| }
|
| }
|
|
|
| @@ -549,6 +573,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()) {
|
|
|