From 3c62f2f635c7379bcdcf64e4efa5ffe4ecb0ba6d Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Wed, 23 Feb 2022 08:24:20 -0500 Subject: [PATCH] Re-add track_caller to panic_no_unwind in bootstrap This function was updated in a recent PR (92911) to be called without the caller information passed in, but the function signature itself was not altered with cfg_attr at the time. --- library/core/src/panicking.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/library/core/src/panicking.rs b/library/core/src/panicking.rs index 91458a4ca2a..89cebaa653f 100644 --- a/library/core/src/panicking.rs +++ b/library/core/src/panicking.rs @@ -84,8 +84,11 @@ fn panic_bounds_check(index: usize, len: usize) -> ! { panic!("index out of bounds: the len is {} but the index is {}", len, index) } +// This function is called directly by the codegen backend, and must not have +// any extra arguments (including those synthesized by track_caller). #[cold] #[inline(never)] +#[cfg_attr(bootstrap, track_caller)] #[lang = "panic_no_unwind"] // needed by codegen for panic in nounwind function fn panic_no_unwind() -> ! { if cfg!(feature = "panic_immediate_abort") { -- 2.44.0