Skip to content

Commit 6d4995f

Browse files
committed
add miri tests and a fixme
1 parent cda25e5 commit 6d4995f

File tree

6 files changed

+112
-0
lines changed

6 files changed

+112
-0
lines changed

compiler/rustc_const_eval/src/interpret/terminator.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -992,6 +992,10 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
992992
bug!("can't tailcall as root");
993993
};
994994

995+
// FIXME(explicit_tail_calls):
996+
// we should check if both caller&callee can/n't unwind,
997+
// see <https://github.com/rust-lang/rust/pull/113128#issuecomment-1614979803>
998+
995999
self.eval_fn_call(
9961000
fn_val,
9971001
(caller_abi, caller_fn_abi),
Lines changed: 10 additions & 0 deletions
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() {}
Lines changed: 25 additions & 0 deletions
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_common::backtrace::__rust_begin_short_backtrace::<fn(), ()>` at RUSTLIB/std/src/sys_common/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+
Lines changed: 17 additions & 0 deletions
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 f(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) {}
Lines changed: 17 additions & 0 deletions
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
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+
Lines changed: 39 additions & 0 deletions
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)