diff options
| author | bors <bors@rust-lang.org> | 2025-07-21 16:49:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-07-21 16:49:10 +0000 |
| commit | 20c571f4ca4689572df8c27fdde8eaa36d77a11d (patch) | |
| tree | 0d25e5981160a49d21d9d51038a7563f78d72189 /compiler/rustc_middle/src | |
| parent | c24557234c6531af7d1cfcc8f518ec4aad55d823 (diff) | |
| parent | 7d0e05d055edaae0378de99ac397a8e1658a0450 (diff) | |
| download | rust-20c571f4ca4689572df8c27fdde8eaa36d77a11d.tar.gz rust-20c571f4ca4689572df8c27fdde8eaa36d77a11d.zip | |
Auto merge of #144087 - cuviper:beta-next, r=cuviper
[beta] backports - Taint body on invalid call ABI rust-lang/rust#142983 - Fix rustdoc not correctly showing attributes with re-exports rust-lang/rust#143083 - trait_sel: `MetaSized` always holds temporarily rust-lang/rust#144016 - Ensure home directory exists rust-lang/rust#144003 r? cuviper
Diffstat (limited to 'compiler/rustc_middle/src')
| -rw-r--r-- | compiler/rustc_middle/src/ty/layout.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_middle/src/ty/layout.rs b/compiler/rustc_middle/src/ty/layout.rs index 13c281a6182..5cb943b0d8c 100644 --- a/compiler/rustc_middle/src/ty/layout.rs +++ b/compiler/rustc_middle/src/ty/layout.rs @@ -1253,7 +1253,8 @@ pub fn fn_can_unwind(tcx: TyCtxt<'_>, fn_def_id: Option<DefId>, abi: ExternAbi) | CCmseNonSecureCall | CCmseNonSecureEntry | Custom - | Unadjusted => false, + | Unadjusted + | RustInvalid => false, Rust | RustCall | RustCold => tcx.sess.panic_strategy() == PanicStrategy::Unwind, } } |