Skip to content

Commit 8341f42

Browse files
katelyn a. martinpnkfelix
katelyn a. martin
authored andcommitted
move new c abi abort behavior behind feature gate
### Background In #76570, new ABI strings including `C-unwind` were introduced. Their behavior is specified in RFC 2945 [1]. However, it was reported in the #ffi-unwind stream of the Rust community Zulip that this had altered the way that `extern "C"` functions behaved even when the `c_unwind` feature gate was not active. [2] ### Overview This makes a small patch to `rustc_mir_build::build::should_abort_on_panic`, so that the same behavior from before is in place when the `c_unwind` gate is not active. `rustc_middle::ty::layout::fn_can_unwind` is not touched, as the visible behavior should not differ before/after #76570. [3] ### Footnotes [1]: https://github.com/rust-lang/rfcs/blob/master/text/2945-c-unwind-abi.md [2]: https://rust-lang.zulipchat.com/#narrow/stream/210922-project-ffi-unwind/topic/Is.20unwinding.20through.20extern.20C.20UB.3F/near/230112325 [3]: https://github.com/rust-lang/rust/pull/76570/files#diff-b0320c2b8868f325d83c027fc5d71732636e9763551e35895488f30fe057c6e9L2599-R2617
1 parent f97769a commit 8341f42

File tree

1 file changed

+5
-1
lines changed
  • compiler/rustc_mir_build/src/build

1 file changed

+5
-1
lines changed

compiler/rustc_mir_build/src/build/mod.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ fn should_abort_on_panic(tcx: TyCtxt<'_>, fn_def_id: LocalDefId, abi: Abi) -> bo
579579
Some(UnwindAttr::Aborts) => true,
580580
// If no attribute was found and the panic strategy is `unwind`, then we should examine
581581
// the function's ABI string to determine whether it should abort upon panic.
582-
None => {
582+
None if tcx.features().c_unwind => {
583583
use Abi::*;
584584
match abi {
585585
// In the case of ABI's that have an `-unwind` equivalent, check whether the ABI
@@ -609,6 +609,10 @@ fn should_abort_on_panic(tcx: TyCtxt<'_>, fn_def_id: LocalDefId, abi: Abi) -> bo
609609
| Unadjusted => true,
610610
}
611611
}
612+
// If the `c_unwind` feature gate is not active, follow the behavior that was in place
613+
// prior to #76570. This is a special case: some functions have a C ABI but are meant to
614+
// unwind anyway. Don't stop them.
615+
None => false, // FIXME(#58794); should be `!(abi == Abi::Rust || abi == Abi::RustCall)`
612616
}
613617
}
614618

0 commit comments

Comments
 (0)