bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

fix #[unwind(abort)] for Rust ABIs

Browse source
This commit is contained in:
Ralf Jung 2019-10-12 20:48:19 +02:00
parent 152527f443
commit a0106527c6
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/librustc_mir/build/mod.rs
View file

@ -502,24 +502,21 @@ macro_rules! unpack {
}; };
} }
fn should_abort_on_panic(tcx: TyCtxt<'_>, fn_def_id: DefId, abi: Abi) -> bool { fn should_abort_on_panic(tcx: TyCtxt<'_>, fn_def_id: DefId, _abi: Abi) -> bool {
// Not callable from C, so we can safely unwind through these // Validate `#[unwind]` syntax regardless of platform-specific panic strategy.
if abi == Abi::Rust || abi == Abi::RustCall { return false; }
// Validate `#[unwind]` syntax regardless of platform-specific panic strategy
let attrs = &tcx.get_attrs(fn_def_id); let attrs = &tcx.get_attrs(fn_def_id);
let unwind_attr = attr::find_unwind_attr(Some(tcx.sess.diagnostic()), attrs); let unwind_attr = attr::find_unwind_attr(Some(tcx.sess.diagnostic()), attrs);
// We never unwind, so it's not relevant to stop an unwind // We never unwind, so it's not relevant to stop an unwind.
if tcx.sess.panic_strategy() != PanicStrategy::Unwind { return false; } if tcx.sess.panic_strategy() != PanicStrategy::Unwind { return false; }
// We cannot add landing pads, so don't add one // We cannot add landing pads, so don't add one.
if tcx.sess.no_landing_pads() { return false; } if tcx.sess.no_landing_pads() { return false; }
// This is a special case: some functions have a C abi but are meant to // This is a special case: some functions have a C abi but are meant to
// unwind anyway. Don't stop them. // unwind anyway. Don't stop them.
match unwind_attr { match unwind_attr {
None => false, // FIXME(#58794) None => false, // FIXME(#58794); should be `!(abi == Abi::Rust || abi == Abi::RustCall)`
Some(UnwindAttr::Allowed) => false, Some(UnwindAttr::Allowed) => false,
Some(UnwindAttr::Aborts) => true, Some(UnwindAttr::Aborts) => true,
} }