Skip to content

PR for llvm/llvm-project#70207 #760

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 31, 2023
Merged

PR for llvm/llvm-project#70207 #760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
763d303
[AArch64] Add test for #70207 (NFC)
nikic Oct 25, 2023
2730ca4
[AArch64][GlobalISel] Fix incorrect ABI when tail call not supported …
nikic Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions llvm/lib/Target/AArch64/GISel/AArch64CallLowering.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,9 +829,9 @@ bool AArch64CallLowering::doCallerAndCalleePassArgsTheSameWay(

bool AArch64CallLowering::areCalleeOutgoingArgsTailCallable(
CallLoweringInfo &Info, MachineFunction &MF,
SmallVectorImpl<ArgInfo> &OutArgs) const {
SmallVectorImpl<ArgInfo> &OrigOutArgs) const {
// If there are no outgoing arguments, then we are done.
if (OutArgs.empty())
if (OrigOutArgs.empty())
return true;

const Function &CallerF = MF.getFunction();
Expand All @@ -851,6 +851,9 @@ bool AArch64CallLowering::areCalleeOutgoingArgsTailCallable(

AArch64OutgoingValueAssigner CalleeAssigner(AssignFnFixed, AssignFnVarArg,
Subtarget, /*IsReturn*/ false);
// determineAssignments() may modify argument flags, so make a copy.
SmallVector<ArgInfo, 8> OutArgs;
append_range(OutArgs, OrigOutArgs);
if (!determineAssignments(CalleeAssigner, OutArgs, OutInfo)) {
LLVM_DEBUG(dbgs() << "... Could not analyze call operands.\n");
return false;
Expand Down
29 changes: 29 additions & 0 deletions llvm/test/CodeGen/AArch64/GlobalISel/call-lowering-tail-call-fallback.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 3
; RUN: llc -mtriple=aarch64-unknown-linux-gnu -global-isel < %s | FileCheck %s

declare void @func(i64, i64, i64, i64, i64, i128, i128)

; Make sure the check for whether a tail call is allowed does not affect the
; calling convention if it fails.
; The first i128 argument should be passed in registers, not on the stack.
define void @pr70207(i128 %arg1, i128 %arg2) nounwind {
; CHECK-LABEL: pr70207:
; CHECK: // %bb.0:
; CHECK-NEXT: mov x8, x2
; CHECK-NEXT: mov x6, x0
; CHECK-NEXT: mov x7, x1
; CHECK-NEXT: mov x9, x3
; CHECK-NEXT: mov x0, xzr
; CHECK-NEXT: mov x1, xzr
; CHECK-NEXT: mov x2, xzr
; CHECK-NEXT: mov x3, xzr
; CHECK-NEXT: mov x4, xzr
; CHECK-NEXT: str x8, [sp, #-32]!
; CHECK-NEXT: stp x9, x30, [sp, #8] // 8-byte Folded Spill
; CHECK-NEXT: bl func
; CHECK-NEXT: ldr x30, [sp, #16] // 8-byte Folded Reload
; CHECK-NEXT: add sp, sp, #32
; CHECK-NEXT: ret
tail call void @func(i64 0, i64 0, i64 0, i64 0, i64 0, i128 %arg1, i128 %arg2)
ret void
}