Rollup merge of #104512 - jyn514:download-ci-llvm-default, r=Mark-Simulacrum

[rust.git] / library / std / src / panicking.rs

diff --git a/library/std/src/panicking.rs b/library/std/src/panicking.rs
index d4976a469cc15d4acbcec47ea13108c97cbb00ea..1039835bbbdfe5430d9f5175ed28b7b4d11ef883 100644 (file)
--- a/library/std/src/panicking.rs
+++ b/library/std/src/panicking.rs
@@ -594,8 +594,8 @@ fn get(&mut self) -> &(dyn Any + Send) {
 // lang item for CTFE panic support
 // never inline unless panic_immediate_abort to avoid code
 // bloat at the call sites as much as possible
-#[cfg_attr(not(feature = "panic_immediate_abort"), inline(never))]
-#[cold]
+#[cfg_attr(not(feature = "panic_immediate_abort"), inline(never), cold)]
+#[cfg_attr(feature = "panic_immediate_abort", inline)]
 #[track_caller]
 #[rustc_do_not_const_check] // hooked by const-eval
 pub const fn begin_panic<M: Any + Send>(msg: M) -> ! {