Skip to content

Commit b6a6619

Browse files
ojedaSasha Levin
authored andcommitted
objtool/rust: add one more noreturn Rust function for Rust 1.87.0
commit 19f5ca4 upstream. Starting with Rust 1.87.0 (expected 2025-05-15), `objtool` may report: rust/core.o: warning: objtool: _R..._4core9panicking9panic_fmt() falls through to next function _R..._4core9panicking18panic_nounwind_fmt() rust/core.o: warning: objtool: _R..._4core9panicking18panic_nounwind_fmt() falls through to next function _R..._4core9panicking5panic() The reason is that `rust_begin_unwind` is now mangled: _R..._7___rustc17rust_begin_unwind Thus add the mangled one to the list so that `objtool` knows it is actually `noreturn`. See commit 56d680d ("objtool/rust: list `noreturn` Rust functions") for more details. Alternatively, we could remove the fixed one in `noreturn.h` and relax this test to cover both, but it seems best to be strict as long as we can. Cc: stable@vger.kernel.org # Needed in 6.12.y and later (Rust is pinned in older LTSs). Cc: Josh Poimboeuf <jpoimboe@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Reviewed-by: Alice Ryhl <aliceryhl@google.com> Link: https://lore.kernel.org/r/20250502140237.1659624-2-ojeda@kernel.org Signed-off-by: Miguel Ojeda <ojeda@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 01b07b3 commit b6a6619

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

tools/objtool/check.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ static bool is_rust_noreturn(const struct symbol *func)
219219
str_ends_with(func->name, "_4core9panicking19assert_failed_inner") ||
220220
str_ends_with(func->name, "_4core9panicking30panic_null_pointer_dereference") ||
221221
str_ends_with(func->name, "_4core9panicking36panic_misaligned_pointer_dereference") ||
222+
str_ends_with(func->name, "_7___rustc17rust_begin_unwind") ||
222223
strstr(func->name, "_4core9panicking13assert_failed") ||
223224
strstr(func->name, "_4core9panicking11panic_const24panic_const_") ||
224225
(strstr(func->name, "_4core5slice5index24slice_") &&

0 commit comments

Comments
 (0)