mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki 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
Show Stats 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; 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. // 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 // This is not part of `codegen_fn_attrs` as it can differ between crates

6
src/test/codegen/unwind-abis/c-unwind-abi-panic-abort.rs
View File

@ -1,7 +1,7 @@
// compile-flags: -C panic=abort // compile-flags: -C panic=abort
// Test that `nounwind` atributes are not applied to `C-unwind` extern functions // Test that `nounwind` atributes are also applied to extern `C-unwind` Rust functions
// even when the code is compiled with `panic=abort`. // when the code is compiled with `panic=abort`.
#![crate_type = "lib"] #![crate_type = "lib"]
#![feature(c_unwind)] #![feature(c_unwind)]
@ -19,4 +19,4 @@ pub unsafe extern "C-unwind" fn rust_item_that_can_unwind() {
// Now, make sure that the LLVM attributes for this functions are correct. First, make // Now, make sure that the LLVM attributes for this functions are correct. First, make
// sure that the first item is correctly marked with the `nounwind` attribute: // sure that the first item is correctly marked with the `nounwind` attribute:
// //
// CHECK-NOT: attributes #0 = { {{.*}}nounwind{{.*}} } // CHECK: attributes #0 = { {{.*}}nounwind{{.*}} }