Skip to content

Commit bc197e2

Browse files
Gnurouojeda
authored andcommitted
rust: num: bounded: Always inline fits_within and from_expr
`from_expr` relies on `build_assert` to infer that the passed expression fits the type's boundaries at build time. That inference can only be successful its code (and that of `fits_within`, which performs the check) is inlined, as a dedicated function would need to work with a variable and cannot verify that property. While inlining happens as expected in most cases, it is not guaranteed. In particular, kernel options that optimize for size like `CONFIG_CC_OPTIMIZE_FOR_SIZE` can result in `from_expr` not being inlined. Add `#[inline(always)]` attributes to both `fits_within` and `from_expr` to make the compiler inline these functions more aggressively, as it does not make sense to use them non-inlined anyway. [ For reference, the errors look like: ld.lld: error: undefined symbol: rust_build_error >>> referenced by build_assert.rs:83 (rust/kernel/build_assert.rs:83) >>> rust/doctests_kernel_generated.o:(<kernel::num::bounded::Bounded<u8, 1>>::from_expr) in archive vmlinux.a - Miguel ] Fixes: 01e345e ("rust: num: add Bounded integer wrapping type") Reported-by: kernel test robot <[email protected]> Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/ Suggested-by: Gary Guo <[email protected]> Signed-off-by: Alexandre Courbot <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Miguel Ojeda <[email protected]>
1 parent 494de8f commit bc197e2

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

rust/kernel/num/bounded.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ macro_rules! fits_within {
3535
}
3636

3737
/// Returns `true` if `value` can be represented with at most `N` bits in a `T`.
38+
#[inline(always)]
3839
fn fits_within<T: Integer>(value: T, num_bits: u32) -> bool {
3940
fits_within!(value, T, num_bits)
4041
}
@@ -362,6 +363,7 @@ where
362363
/// assert_eq!(Bounded::<u8, 1>::from_expr(1).get(), 1);
363364
/// assert_eq!(Bounded::<u16, 8>::from_expr(0xff).get(), 0xff);
364365
/// ```
366+
#[inline(always)]
365367
pub fn from_expr(expr: T) -> Self {
366368
crate::build_assert!(
367369
fits_within(expr, N),

0 commit comments

Comments
 (0)