about summary refs log tree commit diff
path: root/library/std/src
diff options
context:
space:
mode:
authorBen Kimock <kimockb@gmail.com>2022-11-27 18:38:29 -0500
committerBen Kimock <kimockb@gmail.com>2022-11-29 09:24:01 -0500
commit906c3601fa2369cf519e063399070ecb245144e0 (patch)
tree0da15f02d9236072cbbbbb1e96478755be20b3fa /library/std/src
parentb833ad56f46a0bbe0e8729512812a161e7dae28a (diff)
downloadrust-906c3601fa2369cf519e063399070ecb245144e0.tar.gz
rust-906c3601fa2369cf519e063399070ecb245144e0.zip
Adjust inlining attributes around panic_immediate_abort
Diffstat (limited to 'library/std/src')
-rw-r--r--library/std/src/panicking.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/library/std/src/panicking.rs b/library/std/src/panicking.rs
index d4976a469cc..1039835bbbd 100644
--- a/library/std/src/panicking.rs
+++ b/library/std/src/panicking.rs
@@ -594,8 +594,8 @@ pub fn begin_panic_handler(info: &PanicInfo<'_>) -> ! {
 // 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) -> ! {