Skip to content

Commit 8e4c0cd

Browse files
authored
Rollup merge of #129501 - RalfJung:miri-rust-backtrace, r=Noratrieb
panicking: improve hint for Miri's RUST_BACKTRACE behavior Should help with #3838
2 parents 01fc0e8 + 1cf3b68 commit 8e4c0cd

33 files changed

+33
-33
lines changed

tests/fail/function_calls/exported_symbol_bad_unwind1.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
thread 'main' panicked at $DIR/exported_symbol_bad_unwind1.rs:LL:CC:
22
explicit panic
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
4+
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
55
error: Undefined Behavior: unwinding past a stack frame that does not allow unwinding
66
--> $DIR/exported_symbol_bad_unwind1.rs:LL:CC
77
|

tests/fail/function_calls/exported_symbol_bad_unwind2.both.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
thread 'main' panicked at $DIR/exported_symbol_bad_unwind2.rs:LL:CC:
22
explicit panic
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
4+
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
55
thread 'main' panicked at RUSTLIB/core/src/panicking.rs:LL:CC:
66
panic in a function that cannot unwind
77
stack backtrace:

tests/fail/function_calls/exported_symbol_bad_unwind2.definition.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
thread 'main' panicked at $DIR/exported_symbol_bad_unwind2.rs:LL:CC:
22
explicit panic
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
4+
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
55
thread 'main' panicked at RUSTLIB/core/src/panicking.rs:LL:CC:
66
panic in a function that cannot unwind
77
stack backtrace:

tests/fail/function_calls/exported_symbol_bad_unwind2.extern_block.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
thread 'main' panicked at $DIR/exported_symbol_bad_unwind2.rs:LL:CC:
22
explicit panic
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
4+
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
55
error: Undefined Behavior: unwinding past a stack frame that does not allow unwinding
66
--> $DIR/exported_symbol_bad_unwind2.rs:LL:CC
77
|

tests/fail/function_calls/return_pointer_on_unwind.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
thread 'main' panicked at $DIR/return_pointer_on_unwind.rs:LL:CC:
22
explicit panic
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
4+
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
55
error: Undefined Behavior: using uninitialized data, but this operation requires initialized memory
66
--> $DIR/return_pointer_on_unwind.rs:LL:CC
77
|

tests/fail/intrinsics/uninit_uninhabited_type.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
thread 'main' panicked at RUSTLIB/core/src/panicking.rs:LL:CC:
22
aborted execution: attempted to instantiate uninhabited type `!`
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
4+
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
55
thread caused non-unwinding panic. aborting.
66
error: abnormal termination: the program aborted execution
77
--> RUSTLIB/std/src/sys/pal/PLATFORM/mod.rs:LL:CC

tests/fail/intrinsics/zero_fn_ptr.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
thread 'main' panicked at RUSTLIB/core/src/panicking.rs:LL:CC:
22
aborted execution: attempted to zero-initialize type `fn()`, which is invalid
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
4+
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
55
thread caused non-unwinding panic. aborting.
66
error: abnormal termination: the program aborted execution
77
--> RUSTLIB/std/src/sys/pal/PLATFORM/mod.rs:LL:CC

tests/fail/panic/bad_unwind.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
thread 'main' panicked at $DIR/bad_unwind.rs:LL:CC:
22
explicit panic
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
4+
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
55
error: Undefined Behavior: unwinding past a stack frame that does not allow unwinding
66
--> $DIR/bad_unwind.rs:LL:CC
77
|

tests/fail/panic/double_panic.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
thread 'main' panicked at $DIR/double_panic.rs:LL:CC:
22
first
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
4+
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
55
thread 'main' panicked at $DIR/double_panic.rs:LL:CC:
66
second
77
stack backtrace:

tests/fail/panic/panic_abort1.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
thread 'main' panicked at $DIR/panic_abort1.rs:LL:CC:
22
panicking from libstd
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
4+
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
55
error: abnormal termination: the program aborted execution
66
--> RUSTLIB/panic_abort/src/lib.rs:LL:CC
77
|

0 commit comments

Comments
 (0)