From b1c2c78d297029c610ed00d757c90739a59f2d2d Mon Sep 17 00:00:00 2001 From: Ben Kimock Date: Sun, 25 Aug 2024 14:52:53 -0400 Subject: [PATCH] Tweak some attributes to improve panic_immediate_abort --- library/core/src/panic/location.rs | 1 + library/core/src/slice/mod.rs | 4 ++-- library/core/src/slice/sort/shared/smallsort.rs | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/library/core/src/panic/location.rs b/library/core/src/panic/location.rs index 930edffd50517..e2a842046a96d 100644 --- a/library/core/src/panic/location.rs +++ b/library/core/src/panic/location.rs @@ -195,6 +195,7 @@ impl<'a> Location<'a> { #[stable(feature = "panic_hook_display", since = "1.26.0")] impl fmt::Display for Location<'_> { + #[inline] fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result { write!(formatter, "{}:{}:{}", self.file, self.line, self.col) } diff --git a/library/core/src/slice/mod.rs b/library/core/src/slice/mod.rs index c76157720b705..c7918499d4ab9 100644 --- a/library/core/src/slice/mod.rs +++ b/library/core/src/slice/mod.rs @@ -3667,8 +3667,8 @@ impl [T] { { // The panic code path was put into a cold function to not bloat the // call site. - #[inline(never)] - #[cold] + #[cfg_attr(not(feature = "panic_immediate_abort"), inline(never), cold)] + #[cfg_attr(feature = "panic_immediate_abort", inline)] #[track_caller] fn len_mismatch_fail(dst_len: usize, src_len: usize) -> ! { panic!( diff --git a/library/core/src/slice/sort/shared/smallsort.rs b/library/core/src/slice/sort/shared/smallsort.rs index db0c5c72822c0..fae628a7c1474 100644 --- a/library/core/src/slice/sort/shared/smallsort.rs +++ b/library/core/src/slice/sort/shared/smallsort.rs @@ -840,7 +840,8 @@ unsafe fn bidirectional_merge bool>( } } -#[inline(never)] +#[cfg_attr(not(feature = "panic_immediate_abort"), inline(never), cold)] +#[cfg_attr(feature = "panic_immediate_abort", inline)] fn panic_on_ord_violation() -> ! { // This is indicative of a logic bug in the user-provided comparison function or Ord // implementation. They are expected to implement a total order as explained in the Ord