Skip to content

Commit c431b00

Browse files
committed
objtool/rust: add one more noreturn Rust function
`objtool` with Rust 1.84.0 reports: rust/kernel.o: error: objtool: _RNvXNtNtCsaRPFapPOzLs_6kernel3str9parse_intaNtNtB2_7private12FromStrRadix14from_str_radix() falls through to next function _RNvXNtNtCsaRPFapPOzLs_6kernel3str9parse_intaNtNtB2_7private12FromStrRadix16from_u64_negated() This is very similar to commit c18f35e ("objtool/rust: add one more `noreturn` Rust function"), which added `from_ascii_radix_panic` for Rust 1.86.0, except that Rust 1.84.0 ends up needing `from_str_radix_panic`. Thus add it to the list to fix the warning. Cc: FUJITA Tomonori <fujita.tomonori@gmail.com> Fixes: 51d9ee9 ("rust: str: add radix prefixed integer parsing functions") Reported-by: Alice Ryhl <aliceryhl@google.com> Link: https://rust-for-linux.zulipchat.com/#narrow/channel/291565/topic/x/with/572427627 Tested-by: Alice Ryhl <aliceryhl@google.com> Link: https://patch.msgid.link/20260206204336.38462-1-ojeda@kernel.org Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
1 parent 0a9be83 commit c431b00

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

tools/objtool/check.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,8 @@ static bool is_rust_noreturn(const struct symbol *func)
197197
* as well as changes to the source code itself between versions (since
198198
* these come from the Rust standard library).
199199
*/
200-
return str_ends_with(func->name, "_4core3num22from_ascii_radix_panic") ||
200+
return str_ends_with(func->name, "_4core3num20from_str_radix_panic") ||
201+
str_ends_with(func->name, "_4core3num22from_ascii_radix_panic") ||
201202
str_ends_with(func->name, "_4core5sliceSp15copy_from_slice17len_mismatch_fail") ||
202203
str_ends_with(func->name, "_4core6option13expect_failed") ||
203204
str_ends_with(func->name, "_4core6option13unwrap_failed") ||

0 commit comments

Comments
 (0)