diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-04-13 21:58:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-13 21:58:37 +0200 |
| commit | e85ecbbcdcc577d47baae3c0c537c82056340ac9 (patch) | |
| tree | e767cbd887e147bd04de445d85e5a4fd9781b804 /compiler | |
| parent | 232eb698edecb9bc7d5f2bcb9305fdd1291ff63f (diff) | |
| parent | b07a470d1ae47bbae86df0b9dc6de624bcdf0357 (diff) | |
| download | rust-e85ecbbcdcc577d47baae3c0c537c82056340ac9.tar.gz rust-e85ecbbcdcc577d47baae3c0c537c82056340ac9.zip | |
Rollup merge of #110233 - nbdd0121:intrinsic, r=tmiasko
Make rust-intrinsic ABI unwindable Fix #104451, fix https://github.com/rust-lang/miri/issues/2839 r? `@RalfJung`
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/rustc_middle/src/ty/layout.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/rustc_middle/src/ty/layout.rs b/compiler/rustc_middle/src/ty/layout.rs index 2328a1324fc..195d951f9f3 100644 --- a/compiler/rustc_middle/src/ty/layout.rs +++ b/compiler/rustc_middle/src/ty/layout.rs @@ -1226,10 +1226,11 @@ pub fn fn_can_unwind(tcx: TyCtxt<'_>, fn_def_id: Option<DefId>, abi: SpecAbi) -> | AvrNonBlockingInterrupt | CCmseNonSecureCall | Wasm - | RustIntrinsic | PlatformIntrinsic | Unadjusted => false, - Rust | RustCall | RustCold => tcx.sess.panic_strategy() == PanicStrategy::Unwind, + Rust | RustCall | RustCold | RustIntrinsic => { + tcx.sess.panic_strategy() == PanicStrategy::Unwind + } } } |