bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Prevent unwinding when -C panic=abort is used regardless declared ABI

Browse source
This commit is contained in:
Gary Guo 2022-05-11 23:08:02 +01:00
parent 6dd68402c5
commit c586bc3d76
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_middle/src/ty/layout.rs
View file

@ -2888,6 +2888,14 @@ pub fn fn_can_unwind<'tcx>(tcx: TyCtxt<'tcx>, fn_def_id: Option<DefId>, abi: Spe
return false;
}
// With `-C panic=abort`, all non-FFI functions are required to not unwind.
//
// Note that this is true regardless ABI specified on the function -- a `extern "C-unwind"`
// function defined in Rust is also required to abort.
if tcx.sess.panic_strategy() == PanicStrategy::Abort && !tcx.is_foreign_item(did) {
return false;
}
// With -Z panic-in-drop=abort, drop_in_place never unwinds.
//
// This is not part of `codegen_fn_attrs` as it can differ between crates