From 75f3cef756afa4ae5d8b9c9e6b52124701c2285b Mon Sep 17 00:00:00 2001 From: Ben Kimock Date: Fri, 10 Nov 2023 22:51:58 -0500 Subject: [PATCH] panic_nounwind in Arguments::new* instead of recursing --- library/core/src/fmt/mod.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/library/core/src/fmt/mod.rs b/library/core/src/fmt/mod.rs index 9b372eac52455..60a27863413cc 100644 --- a/library/core/src/fmt/mod.rs +++ b/library/core/src/fmt/mod.rs @@ -340,7 +340,9 @@ impl<'a> Arguments<'a> { #[rustc_const_unstable(feature = "const_fmt_arguments_new", issue = "none")] pub const fn new_const(pieces: &'a [&'static str]) -> Self { if pieces.len() > 1 { - panic!("invalid args"); + // Since panic!() expands to panic_fmt(format_args!()), using panic! here is both a + // bit silly and also significantly increases the amount of MIR generated by panics. + crate::panicking::panic_nounwind("invalid args"); } Arguments { pieces, fmt: None, args: &[] } } @@ -350,7 +352,8 @@ impl<'a> Arguments<'a> { #[inline] pub fn new_v1(pieces: &'a [&'static str], args: &'a [rt::Argument<'a>]) -> Arguments<'a> { if pieces.len() < args.len() || pieces.len() > args.len() + 1 { - panic!("invalid args"); + // See Arguments::new_const for why we don't use panic!. + crate::panicking::panic_nounwind("invalid args"); } Arguments { pieces, fmt: None, args } }