Skip to content

Commit 48afccc

Browse files
borsbors
committed
Auto merge of #153361 - folkertdev:tail-call-indirect-on-stack-true, r=<try>
enable `PassMode::Indirect { on_stack: true, .. }` tail call arguments try-job: test-various
2 parents b90dc1e + 391a755 commit 48afccc

4 files changed

Lines changed: 341 additions & 46 deletions

File tree

‎compiler/rustc_codegen_ssa/src/mir/block.rs‎

Lines changed: 28 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,55 +1256,37 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
12561256
}
12571257
}
12581258
CallKind::Tail => {
1259-
match fn_abi.args[i].mode {
1260-
PassMode::Indirect { on_stack: false, .. } => {
1261-
let Some(tmp) = tail_call_temporaries[i].take() else {
1262-
span_bug!(
1263-
fn_span,
1264-
"missing temporary for indirect tail call argument #{i}"
1265-
)
1266-
};
1267-
1268-
let local = self.mir.args_iter().nth(i).unwrap();
1269-
1270-
match &self.locals[local] {
1271-
LocalRef::Place(arg) => {
1272-
bx.typed_place_copy(arg.val, tmp.val, fn_abi.args[i].layout);
1273-
op.val = Ref(arg.val);
1274-
}
1275-
LocalRef::Operand(arg) => {
1276-
let Ref(place_value) = arg.val else {
1277-
bug!("only `Ref` should use `PassMode::Indirect`");
1278-
};
1279-
bx.typed_place_copy(
1280-
place_value,
1281-
tmp.val,
1282-
fn_abi.args[i].layout,
1283-
);
1284-
op.val = arg.val;
1285-
}
1286-
LocalRef::UnsizedPlace(_) => {
1287-
span_bug!(fn_span, "unsized types are not supported")
1288-
}
1289-
LocalRef::PendingOperand => {
1290-
span_bug!(fn_span, "argument local should not be pending")
1291-
}
1292-
};
1293-
1294-
bx.lifetime_end(tmp.val.llval, tmp.layout.size);
1295-
}
1296-
PassMode::Indirect { on_stack: true, .. } => {
1297-
// FIXME: some LLVM backends (notably x86) do not correctly pass byval
1298-
// arguments to tail calls (as of LLVM 21). See also:
1299-
//
1300-
// - https://github.com/rust-lang/rust/pull/144232#discussion_r2218543841
1301-
// - https://github.com/rust-lang/rust/issues/144855
1259+
if let PassMode::Indirect { on_stack: false, .. } = fn_abi.args[i].mode {
1260+
let Some(tmp) = tail_call_temporaries[i].take() else {
13021261
span_bug!(
13031262
fn_span,
1304-
"arguments using PassMode::Indirect {{ on_stack: true, .. }} are currently not supported for tail calls"
1263+
"missing temporary for indirect tail call argument #{i}"
13051264
)
1306-
}
1307-
_ => (),
1265+
};
1266+
1267+
let local = self.mir.args_iter().nth(i).unwrap();
1268+
1269+
match &self.locals[local] {
1270+
LocalRef::Place(arg) => {
1271+
bx.typed_place_copy(arg.val, tmp.val, fn_abi.args[i].layout);
1272+
op.val = Ref(arg.val);
1273+
}
1274+
LocalRef::Operand(arg) => {
1275+
let Ref(place_value) = arg.val else {
1276+
bug!("only `Ref` should use `PassMode::Indirect`");
1277+
};
1278+
bx.typed_place_copy(place_value, tmp.val, fn_abi.args[i].layout);
1279+
op.val = arg.val;
1280+
}
1281+
LocalRef::UnsizedPlace(_) => {
1282+
span_bug!(fn_span, "unsized types are not supported")
1283+
}
1284+
LocalRef::PendingOperand => {
1285+
span_bug!(fn_span, "argument local should not be pending")
1286+
}
1287+
};
1288+
1289+
bx.lifetime_end(tmp.val.llval, tmp.layout.size);
13081290
}
13091291
}
13101292
}

‎tests/ui/explicit-tail-calls/support/basic.rs‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
//@ build-pass
2+
//@ ignore-backends: gcc
3+
//@ add-minicore
4+
//@ min-llvm-version: 22
5+
//
6+
//@ revisions: i686
7+
//@[i686] compile-flags: --target i686-unknown-linux-gnu
8+
//@[i686] needs-llvm-components: x86
9+
//@ revisions: x86-64
10+
//@[x86-64] compile-flags: --target x86_64-unknown-linux-gnu
11+
//@[x86-64] needs-llvm-components: x86
12+
//@ revisions: x86-64-win
13+
//@[x86-64-win] compile-flags: --target x86_64-pc-windows-msvc
14+
//@[x86-64-win] needs-llvm-components: x86
15+
//@ revisions: arm
16+
//@[arm] compile-flags: --target arm-unknown-linux-gnueabi
17+
//@[arm] needs-llvm-components: arm
18+
//@ revisions: thumb
19+
//@[thumb] compile-flags: --target thumbv8m.main-none-eabi
20+
//@[thumb] needs-llvm-components: arm
21+
//@ revisions: aarch64
22+
//@[aarch64] compile-flags: --target aarch64-unknown-linux-gnu
23+
//@[aarch64] needs-llvm-components: aarch64
24+
//@ revisions: s390x
25+
//@[s390x] compile-flags: --target s390x-unknown-linux-gnu
26+
//@[s390x] needs-llvm-components: systemz
27+
//@ revisions: sparc
28+
//@[sparc] compile-flags: --target sparc-unknown-linux-gnu
29+
//@[sparc] needs-llvm-components: sparc
30+
//@ revisions: sparc64
31+
//@[sparc64] compile-flags: --target sparc64-unknown-linux-gnu
32+
//@[sparc64] needs-llvm-components: sparc
33+
//@ revisions: powerpc64
34+
//@[powerpc64] compile-flags: --target powerpc64-unknown-linux-gnu
35+
//@[powerpc64] needs-llvm-components: powerpc
36+
//@ revisions: riscv
37+
//@[riscv] compile-flags: --target riscv64gc-unknown-linux-gnu
38+
//@[riscv] needs-llvm-components: riscv
39+
//@ revisions: loongarch32
40+
//@[loongarch32] compile-flags: --target loongarch32-unknown-none
41+
//@[loongarch32] needs-llvm-components: loongarch
42+
//@ revisions: loongarch64
43+
//@[loongarch64] compile-flags: --target loongarch64-unknown-linux-gnu
44+
//@[loongarch64] needs-llvm-components: loongarch
45+
//@ revisions: bpf
46+
//@[bpf] compile-flags: --target bpfeb-unknown-none
47+
//@[bpf] needs-llvm-components: bpf
48+
//@ revisions: m68k
49+
//@[m68k] compile-flags: --target m68k-unknown-linux-gnu
50+
//@[m68k] needs-llvm-components: m68k
51+
//@ revisions: nvptx64
52+
//@[nvptx64] compile-flags: --target nvptx64-nvidia-cuda
53+
//@[nvptx64] needs-llvm-components: nvptx
54+
//
55+
// Wasm needs a special target feature.
56+
//
57+
//@ revisions: wasm
58+
//@[wasm] compile-flags: --target wasm32-unknown-unknown -Ctarget-feature=+tail-call
59+
//@[wasm] needs-llvm-components: webassembly
60+
//@ revisions: wasip1
61+
//@[wasip1] compile-flags: --target wasm32-wasip1 -Ctarget-feature=+tail-call
62+
//@[wasip1] needs-llvm-components: webassembly
63+
//
64+
// Failing cases (just zero support)
65+
//
66+
// //@ revisions: powerpc
67+
// //@[powerpc] compile-flags: --target powerpc-unknown-linux-gnu
68+
// //@[powerpc] needs-llvm-components: powerpc
69+
// //@ revisions: aix
70+
// //@[aix] compile-flags: --target powerpc64-ibm-aix
71+
// //@[aix] needs-llvm-components: powerpc
72+
// //@ revisions: csky
73+
// //@[csky] compile-flags: --target csky-unknown-linux-gnuabiv2
74+
// //@[csky] needs-llvm-components: csky
75+
// //@ revisions: mips
76+
// //@[mips] compile-flags: --target mips-unknown-linux-gnu
77+
// //@[mips] needs-llvm-components: mips
78+
// //@ revisions: mips64
79+
// //@[mips64] compile-flags: --target mips64-unknown-linux-gnuabi64
80+
// //@[mips64] needs-llvm-components: mips
81+
#![feature(no_core, explicit_tail_calls)]
82+
#![expect(incomplete_features)]
83+
#![no_core]
84+
#![crate_type = "lib"]
85+
86+
extern crate minicore;
87+
use minicore::*;
88+
89+
#[inline(never)]
90+
fn simple1(x: u64) -> u64 {
91+
x
92+
}
93+
94+
#[unsafe(no_mangle)]
95+
fn simple2(x: u64) -> u64 {
96+
become simple1(x);
97+
}

‎tests/ui/explicit-tail-calls/support/bystack.rs‎

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
//@ build-pass
2+
//@ ignore-backends: gcc
3+
//@ add-minicore
4+
//@ min-llvm-version: 22
5+
//
6+
//@ revisions: i686
7+
//@[i686] compile-flags: --target i686-unknown-linux-gnu
8+
//@[i686] needs-llvm-components: x86
9+
//@ revisions: x86-64
10+
//@[x86-64] compile-flags: --target x86_64-unknown-linux-gnu
11+
//@[x86-64] needs-llvm-components: x86
12+
//@ revisions: x86-64-win
13+
//@[x86-64-win] compile-flags: --target x86_64-pc-windows-msvc
14+
//@[x86-64-win] needs-llvm-components: x86
15+
//@ revisions: arm
16+
//@[arm] compile-flags: --target arm-unknown-linux-gnueabi
17+
//@[arm] needs-llvm-components: arm
18+
//@ revisions: thumb
19+
//@[thumb] compile-flags: --target thumbv8m.main-none-eabi
20+
//@[thumb] needs-llvm-components: arm
21+
//@ revisions: aarch64
22+
//@[aarch64] compile-flags: --target aarch64-unknown-linux-gnu
23+
//@[aarch64] needs-llvm-components: aarch64
24+
//@ revisions: s390x
25+
//@[s390x] compile-flags: --target s390x-unknown-linux-gnu
26+
//@[s390x] needs-llvm-components: systemz
27+
//@ revisions: sparc
28+
//@[sparc] compile-flags: --target sparc-unknown-linux-gnu
29+
//@[sparc] needs-llvm-components: sparc
30+
//@ revisions: sparc64
31+
//@[sparc64] compile-flags: --target sparc64-unknown-linux-gnu
32+
//@[sparc64] needs-llvm-components: sparc
33+
//@ revisions: powerpc64
34+
//@[powerpc64] compile-flags: --target powerpc64-unknown-linux-gnu
35+
//@[powerpc64] needs-llvm-components: powerpc
36+
//@ revisions: loongarch32
37+
//@[loongarch32] compile-flags: --target loongarch32-unknown-none
38+
//@[loongarch32] needs-llvm-components: loongarch
39+
//@ revisions: loongarch64
40+
//@[loongarch64] compile-flags: --target loongarch64-unknown-linux-gnu
41+
//@[loongarch64] needs-llvm-components: loongarch
42+
//@ revisions: bpf
43+
//@[bpf] compile-flags: --target bpfeb-unknown-none
44+
//@[bpf] needs-llvm-components: bpf
45+
//@ revisions: m68k
46+
//@[m68k] compile-flags: --target m68k-unknown-linux-gnu
47+
//@[m68k] needs-llvm-components: m68k
48+
//@ revisions: nvptx64
49+
//@[nvptx64] compile-flags: --target nvptx64-nvidia-cuda
50+
//@[nvptx64] needs-llvm-components: nvptx
51+
//
52+
// Riscv does not support byval in LLVM 22 (but wil in LLVM 23)
53+
//
54+
// //@ revisions: riscv
55+
// //@[riscv] compile-flags: --target riscv64gc-unknown-linux-gnu
56+
// //@[riscv] needs-llvm-components: riscv
57+
//
58+
// Wasm needs a special target feature.
59+
//
60+
//@ revisions: wasm
61+
//@[wasm] compile-flags: --target wasm32-unknown-unknown -Ctarget-feature=+tail-call
62+
//@[wasm] needs-llvm-components: webassembly
63+
//@ revisions: wasip1
64+
//@[wasip1] compile-flags: --target wasm32-wasip1 -Ctarget-feature=+tail-call
65+
//@[wasip1] needs-llvm-components: webassembly
66+
//
67+
// Failing cases (just zero support)
68+
//
69+
// //@ revisions: powerpc
70+
// //@[powerpc] compile-flags: --target powerpc-unknown-linux-gnu
71+
// //@[powerpc] needs-llvm-components: powerpc
72+
// //@ revisions: aix
73+
// //@[aix] compile-flags: --target powerpc64-ibm-aix
74+
// //@[aix] needs-llvm-components: powerpc
75+
// //@ revisions: csky
76+
// //@[csky] compile-flags: --target csky-unknown-linux-gnuabiv2
77+
// //@[csky] needs-llvm-components: csky
78+
// //@ revisions: mips
79+
// //@[mips] compile-flags: --target mips-unknown-linux-gnu
80+
// //@[mips] needs-llvm-components: mips
81+
// //@ revisions: mips64
82+
// //@[mips64] compile-flags: --target mips64-unknown-linux-gnuabi64
83+
// //@[mips64] needs-llvm-components: mips
84+
#![feature(no_core, explicit_tail_calls)]
85+
#![expect(incomplete_features)]
86+
#![no_core]
87+
#![crate_type = "lib"]
88+
89+
extern crate minicore;
90+
use minicore::*;
91+
92+
#[repr(C)]
93+
struct PassedByVal {
94+
a: u64,
95+
b: u64,
96+
c: u64,
97+
d: u64,
98+
}
99+
100+
#[inline(never)]
101+
extern "C" fn callee(x: PassedByVal) -> PassedByVal {
102+
x
103+
}
104+
105+
#[unsafe(no_mangle)]
106+
extern "C" fn byval(x: PassedByVal) -> PassedByVal {
107+
become callee(x);
108+
}

‎tests/ui/explicit-tail-calls/support/byval.rs‎

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
//@ build-pass
2+
//@ ignore-backends: gcc
3+
//@ add-minicore
4+
//@ min-llvm-version: 22
5+
//
6+
//@ revisions: i686
7+
//@[i686] compile-flags: --target i686-unknown-linux-gnu
8+
//@[i686] needs-llvm-components: x86
9+
//@ revisions: x86-64
10+
//@[x86-64] compile-flags: --target x86_64-unknown-linux-gnu
11+
//@[x86-64] needs-llvm-components: x86
12+
//@ revisions: x86-64-win
13+
//@[x86-64-win] compile-flags: --target x86_64-pc-windows-msvc
14+
//@[x86-64-win] needs-llvm-components: x86
15+
//@ revisions: arm
16+
//@[arm] compile-flags: --target arm-unknown-linux-gnueabi
17+
//@[arm] needs-llvm-components: arm
18+
//@ revisions: thumb
19+
//@[thumb] compile-flags: --target thumbv8m.main-none-eabi
20+
//@[thumb] needs-llvm-components: arm
21+
//@ revisions: aarch64
22+
//@[aarch64] compile-flags: --target aarch64-unknown-linux-gnu
23+
//@[aarch64] needs-llvm-components: aarch64
24+
//@ revisions: s390x
25+
//@[s390x] compile-flags: --target s390x-unknown-linux-gnu
26+
//@[s390x] needs-llvm-components: systemz
27+
//@ revisions: sparc
28+
//@[sparc] compile-flags: --target sparc-unknown-linux-gnu
29+
//@[sparc] needs-llvm-components: sparc
30+
//@ revisions: sparc64
31+
//@[sparc64] compile-flags: --target sparc64-unknown-linux-gnu
32+
//@[sparc64] needs-llvm-components: sparc
33+
//@ revisions: powerpc64
34+
//@[powerpc64] compile-flags: --target powerpc64-unknown-linux-gnu
35+
//@[powerpc64] needs-llvm-components: powerpc
36+
//@ revisions: loongarch32
37+
//@[loongarch32] compile-flags: --target loongarch32-unknown-none
38+
//@[loongarch32] needs-llvm-components: loongarch
39+
//@ revisions: loongarch64
40+
//@[loongarch64] compile-flags: --target loongarch64-unknown-linux-gnu
41+
//@[loongarch64] needs-llvm-components: loongarch
42+
//@ revisions: bpf
43+
//@[bpf] compile-flags: --target bpfeb-unknown-none
44+
//@[bpf] needs-llvm-components: bpf
45+
//@ revisions: m68k
46+
//@[m68k] compile-flags: --target m68k-unknown-linux-gnu
47+
//@[m68k] needs-llvm-components: m68k
48+
//@ revisions: nvptx64
49+
//@[nvptx64] compile-flags: --target nvptx64-nvidia-cuda
50+
//@[nvptx64] needs-llvm-components: nvptx
51+
//
52+
// Riscv does not support byval in LLVM 22 (but wil in LLVM 23)
53+
//
54+
// //@ revisions: riscv
55+
// //@[riscv] compile-flags: --target riscv64gc-unknown-linux-gnu
56+
// //@[riscv] needs-llvm-components: riscv
57+
//
58+
// Wasm needs a special target feature.
59+
//
60+
//@ revisions: wasm
61+
//@[wasm] compile-flags: --target wasm32-unknown-unknown -Ctarget-feature=+tail-call
62+
//@[wasm] needs-llvm-components: webassembly
63+
//@ revisions: wasip1
64+
//@[wasip1] compile-flags: --target wasm32-wasip1 -Ctarget-feature=+tail-call
65+
//@[wasip1] needs-llvm-components: webassembly
66+
//
67+
// Failing cases (just zero support)
68+
//
69+
// //@ revisions: powerpc
70+
// //@[powerpc] compile-flags: --target powerpc-unknown-linux-gnu
71+
// //@[powerpc] needs-llvm-components: powerpc
72+
// //@ revisions: aix
73+
// //@[aix] compile-flags: --target powerpc64-ibm-aix
74+
// //@[aix] needs-llvm-components: powerpc
75+
// //@ revisions: csky
76+
// //@[csky] compile-flags: --target csky-unknown-linux-gnuabiv2
77+
// //@[csky] needs-llvm-components: csky
78+
// //@ revisions: mips
79+
// //@[mips] compile-flags: --target mips-unknown-linux-gnu
80+
// //@[mips] needs-llvm-components: mips
81+
// //@ revisions: mips64
82+
// //@[mips64] compile-flags: --target mips64-unknown-linux-gnuabi64
83+
// //@[mips64] needs-llvm-components: mips
84+
#![feature(no_core, explicit_tail_calls)]
85+
#![expect(incomplete_features)]
86+
#![no_core]
87+
#![crate_type = "lib"]
88+
89+
extern crate minicore;
90+
use minicore::*;
91+
92+
// The rust calling convention will pass this by-value.
93+
struct PassedByVal {
94+
a: u64,
95+
b: u64,
96+
c: u64,
97+
d: u64,
98+
}
99+
100+
#[inline(never)]
101+
fn callee(x: PassedByVal) -> PassedByVal {
102+
x
103+
}
104+
105+
#[unsafe(no_mangle)]
106+
fn byval(x: PassedByVal) -> PassedByVal {
107+
become callee(x);
108+
}

0 commit comments

Comments
 (0)