Skip to content

Commit 869b05e

Browse files
committed
Auto merge of #113128 - WaffleLapkin:become_trully_unuwuable, r=oli-obk,RalfJung
Support tail calls in mir via `TerminatorKind::TailCall` This is one of the interesting bits in tail call implementation — MIR support. This adds a new `TerminatorKind` which represents a tail call: ```rust TailCall { func: Operand<'tcx>, args: Vec<Operand<'tcx>>, fn_span: Span, }, ``` *Structurally* this is very similar to a normal `Call` but is missing a few fields: - `destination` — tail calls don't write to destination, instead they pass caller's destination to the callee (such that eventual `return` will write to the caller of the function that used tail call) - `target` — similarly to `destination` tail calls pass the caller's return address to the callee, so there is nothing to do - `unwind` — I _think_ this is applicable too, although it's a bit confusing - `call_source` — `become` forbids operators and is not created as a lowering of something else; tail calls always come from HIR (at least for now) It might be helpful to read the interpreter implementation to understand what `TailCall` means exactly, although I've tried documenting it too. ----- There are a few `FIXME`-questions still left, ideally we'd be able to answer them during review ':) ----- r? `@oli-obk` cc `@scottmcm` `@DrMeepster` `@JakobDegen`
2 parents 131707b + 0ed53e1 commit 869b05e

File tree

7 files changed

+112
-4
lines changed

7 files changed

+112
-4
lines changed

src/machine.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1434,7 +1434,7 @@ impl<'tcx> Machine<'tcx> for MiriMachine<'tcx> {
14341434
ecx: &mut InterpCx<'tcx, Self>,
14351435
frame: Frame<'tcx, Provenance, FrameExtra<'tcx>>,
14361436
unwinding: bool,
1437-
) -> InterpResult<'tcx, StackPopJump> {
1437+
) -> InterpResult<'tcx, ReturnAction> {
14381438
if frame.extra.is_user_relevant {
14391439
// All that we store is whether or not the frame we just removed is local, so now we
14401440
// have no idea where the next topmost local frame is. So we recompute it.

src/shims/panic.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
113113
&mut self,
114114
mut extra: FrameExtra<'tcx>,
115115
unwinding: bool,
116-
) -> InterpResult<'tcx, StackPopJump> {
116+
) -> InterpResult<'tcx, ReturnAction> {
117117
let this = self.eval_context_mut();
118118
trace!("handle_stack_pop_unwind(extra = {:?}, unwinding = {})", extra, unwinding);
119119

@@ -150,9 +150,9 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
150150
)?;
151151

152152
// We pushed a new stack frame, the engine should not do any jumping now!
153-
Ok(StackPopJump::NoJump)
153+
Ok(ReturnAction::NoJump)
154154
} else {
155-
Ok(StackPopJump::Normal)
155+
Ok(ReturnAction::Normal)
156156
}
157157
}
158158

tests/fail/tail_calls/cc-mismatch.rs

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
//@error-in-other-file: Undefined Behavior: calling a function with calling convention C using calling convention Rust
2+
#![feature(explicit_tail_calls)]
3+
#![allow(incomplete_features)]
4+
5+
fn main() {
6+
let f = unsafe { std::mem::transmute::<extern "C" fn(), fn()>(f) };
7+
become f();
8+
}
9+
10+
extern "C" fn f() {}
+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
error: Undefined Behavior: calling a function with calling convention C using calling convention Rust
2+
--> RUSTLIB/core/src/ops/function.rs:LL:CC
3+
|
4+
LL | extern "rust-call" fn call_once(self, args: Args) -> Self::Output;
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ calling a function with calling convention C using calling convention Rust
6+
|
7+
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
8+
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
9+
= note: BACKTRACE:
10+
= note: inside `<fn() as std::ops::FnOnce<()>>::call_once - shim(fn())` at RUSTLIB/core/src/ops/function.rs:LL:CC
11+
= note: inside `std::sys::backtrace::__rust_begin_short_backtrace::<fn(), ()>` at RUSTLIB/std/src/sys/backtrace.rs:LL:CC
12+
= note: inside closure at RUSTLIB/std/src/rt.rs:LL:CC
13+
= note: inside `std::ops::function::impls::<impl std::ops::FnOnce<()> for &dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe>::call_once` at RUSTLIB/core/src/ops/function.rs:LL:CC
14+
= note: inside `std::panicking::r#try::do_call::<&dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe, i32>` at RUSTLIB/std/src/panicking.rs:LL:CC
15+
= note: inside `std::panicking::r#try::<i32, &dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe>` at RUSTLIB/std/src/panicking.rs:LL:CC
16+
= note: inside `std::panic::catch_unwind::<&dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe, i32>` at RUSTLIB/std/src/panic.rs:LL:CC
17+
= note: inside closure at RUSTLIB/std/src/rt.rs:LL:CC
18+
= note: inside `std::panicking::r#try::do_call::<{closure@std::rt::lang_start_internal::{closure#2}}, isize>` at RUSTLIB/std/src/panicking.rs:LL:CC
19+
= note: inside `std::panicking::r#try::<isize, {closure@std::rt::lang_start_internal::{closure#2}}>` at RUSTLIB/std/src/panicking.rs:LL:CC
20+
= note: inside `std::panic::catch_unwind::<{closure@std::rt::lang_start_internal::{closure#2}}, isize>` at RUSTLIB/std/src/panic.rs:LL:CC
21+
= note: inside `std::rt::lang_start_internal` at RUSTLIB/std/src/rt.rs:LL:CC
22+
= note: inside `std::rt::lang_start::<()>` at RUSTLIB/std/src/rt.rs:LL:CC
23+
24+
error: aborting due to 1 previous error
25+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#![feature(explicit_tail_calls)]
2+
#![allow(incomplete_features)]
3+
4+
fn main() {
5+
// FIXME(explicit_tail_calls):
6+
// the error should point to `become g(x)`,
7+
// but tail calls mess up the backtrace it seems like...
8+
f(0);
9+
//~^ error: Undefined Behavior: calling a function with argument of type i32 passing data of type u32
10+
}
11+
12+
fn f(x: u32) {
13+
let g = unsafe { std::mem::transmute::<fn(i32), fn(u32)>(g) };
14+
become g(x);
15+
}
16+
17+
fn g(_: i32) {}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
error: Undefined Behavior: calling a function with argument of type i32 passing data of type u32
2+
--> $DIR/signature-mismatch-arg.rs:LL:CC
3+
|
4+
LL | f(0);
5+
| ^^^^ calling a function with argument of type i32 passing data of type u32
6+
|
7+
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
8+
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
9+
= help: this means these two types are not *guaranteed* to be ABI-compatible across all targets
10+
= help: if you think this code should be accepted anyway, please report an issue with Miri
11+
= note: BACKTRACE:
12+
= note: inside `main` at $DIR/signature-mismatch-arg.rs:LL:CC
13+
14+
note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
15+
16+
error: aborting due to 1 previous error
17+

tests/pass/tail_call.rs

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
#![allow(incomplete_features)]
2+
#![feature(explicit_tail_calls)]
3+
4+
fn main() {
5+
assert_eq!(factorial(10), 3_628_800);
6+
assert_eq!(mutually_recursive_identity(1000), 1000);
7+
}
8+
9+
fn factorial(n: u32) -> u32 {
10+
fn factorial_acc(n: u32, acc: u32) -> u32 {
11+
match n {
12+
0 => acc,
13+
_ => become factorial_acc(n - 1, acc * n),
14+
}
15+
}
16+
17+
factorial_acc(n, 1)
18+
}
19+
20+
// this is of course very silly, but we need to demonstrate mutual recursion somehow so...
21+
fn mutually_recursive_identity(x: u32) -> u32 {
22+
fn switch(src: u32, tgt: u32) -> u32 {
23+
match src {
24+
0 => tgt,
25+
_ if src % 7 == 0 => become advance_with_extra_steps(src, tgt),
26+
_ => become advance(src, tgt),
27+
}
28+
}
29+
30+
fn advance(src: u32, tgt: u32) -> u32 {
31+
become switch(src - 1, tgt + 1)
32+
}
33+
34+
fn advance_with_extra_steps(src: u32, tgt: u32) -> u32 {
35+
become advance(src, tgt)
36+
}
37+
38+
switch(x, 0)
39+
}

0 commit comments

Comments
 (0)