inline Option panics on panic_immediate_abort

rust-lang · Dec 10, 2021 · 0adee2c · 0adee2c
1 parent 3cf9ae6
commit 0adee2c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/library/core/src/option.rs b/library/core/src/option.rs
@@ -1656,7 +1656,8 @@ impl<T, E> Option<Result<T, E>> {
 }
 
 // This is a separate function to reduce the code size of .expect() itself.
-#[inline(never)]
+#[cfg_attr(not(feature = "panic_immediate_abort"), inline(never))]
+#[cfg_attr(feature = "panic_immediate_abort", inline)]
 #[cold]
 #[track_caller]
 const fn expect_failed(msg: &str) -> ! {