Merge commit '35d9c6bf256968e1b40e0d554607928bdf9cebea' into sync_cg_clif-2022-02-23

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

diff --git a/library/core/src/panicking.rs b/library/core/src/panicking.rs
index 0798076411ac4bff1d157112732fea1ced9b0d07..2b720fc4192a7e04ee212a1961635ebba41f79dd 100644 (file)
--- a/library/core/src/panicking.rs
+++ b/library/core/src/panicking.rs
@@ -87,8 +87,7 @@ fn panic_bounds_check(index: usize, len: usize) -> ! {
 
 #[cfg(not(bootstrap))]
 #[cold]
-#[cfg_attr(not(feature = "panic_immediate_abort"), inline(never))]
-#[track_caller]
+#[inline(never)]
 #[lang = "panic_no_unwind"] // needed by codegen for panic in nounwind function
 fn panic_no_unwind() -> ! {
     if cfg!(feature = "panic_immediate_abort") {