bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #117557 - Zoxc:panic-prio, r=petrochenkov

Browse source 
Make `FatalErrorMarker` lower priority than other panics

This makes `FatalErrorMarker` lower priority than other panics in a parallel sections. If any other panics occur, they will be unwound instead of `FatalErrorMarker`. This ensures `rustc` will exit with the correct error code on ICEs.

This fixes https://github.com/rust-lang/rust/issues/116659.
This commit is contained in:
bors 2023-11-09 00:39:02 +00:00
commit d8dbf7ca0e
3 changed files with 30 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_span/src/fatal_error.rs
View file

@ -3,7 +3,7 @@
#[must_use]
pub struct FatalError;
pub struct FatalErrorMarker;
pub use rustc_data_structures::FatalErrorMarker;
// Don't implement Send on FatalError. This makes it impossible to `panic_any!(FatalError)`.
// We don't want to invoke the panic handler and print a backtrace for fatal errors.