Unrolled build for rust-lang#133182

rust-timer · web-flow · commit 397a417f2ac5 · 2024-11-19T03:32:49.000-05:00
Rollup merge of rust-lang#133182 - RalfJung:const-panic-inline, r=tgross35 const_panic: inline in bootstrap builds to avoid f16/f128 crashes This should fix rust-lang#133177. ``@uweigand`` could you test that?
diff --git a/library/core/src/panic.rs b/library/core/src/panic.rs
@@ -215,7 +215,7 @@ pub macro const_panic {
                 #[noinline]
                 if const #[track_caller] #[inline] { // Inline this, to prevent codegen
                     $crate::panic!($const_msg)
-                } else #[track_caller] { // Do not inline this, it makes perf worse
+                } else #[track_caller] #[cfg_attr(bootstrap, inline)] { // Do not inline this, it makes perf worse
                     $crate::panic!($runtime_msg)
                 }
             )

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ pub macro const_panic {`
`215`	`215`	`#[noinline]`
`216`	`216`	`if const #[track_caller] #[inline] { // Inline this, to prevent codegen`
`217`	`217`	`$crate::panic!($const_msg)`
`218`		`- } else #[track_caller] { // Do not inline this, it makes perf worse`
	`218`	`+ } else #[track_caller] #[cfg_attr(bootstrap, inline)] { // Do not inline this, it makes perf worse`
`219`	`219`	`$crate::panic!($runtime_msg)`
`220`	`220`	`}`
`221`	`221`	`)`