Skip to content

Commit b06258c

Browse files
committed
Auto merge of rust-lang#118228 - Mark-Simulacrum:alloc-opt, r=scottmcm
Indicate that multiplication in Layout::array cannot overflow Since rust-lang#113113, we have added a check that skips calling into the allocator at all if `capacity == 0`. The global, default allocator will not actually try to allocate though; it returns a dangling pointer explicitly. However, these two checks are not merged/deduplicated by LLVM and so we're comparing to zero twice whenever vectors are allocated/grown. Probably cheap, but also potentially expensive in code size and seems like an unfortunate miss. This removes that extra check by telling LLVM that the multiplication as part of Layout::array can't overflow, turning the original non-zero value into a zero value afterwards. In my checks locally this successfully drops the duplicate comparisons. See https://rust.godbolt.org/z/b6nPP9dcK for a code example. ```rust pub fn foo(elements: usize) -> Vec<u32> { Vec::with_capacity(elements) } ``` r? `@scottmcm` since you touched this in a32305a - curious if you have thoughts on doing this / can confirm my model of this being correct.
2 parents f74f700 + b81e788 commit b06258c

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

library/core/src/alloc/layout.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,11 @@ impl Layout {
450450
return Err(LayoutError);
451451
}
452452

453-
let array_size = element_size * n;
453+
// SAFETY: We just checked that we won't overflow `usize` when we multiply.
454+
// This is a useless hint inside this function, but after inlining this helps
455+
// deduplicate checks for whether the overall capacity is zero (e.g., in RawVec's
456+
// allocation path) before/after this multiplication.
457+
let array_size = unsafe { element_size.unchecked_mul(n) };
454458

455459
// SAFETY: We just checked above that the `array_size` will not
456460
// exceed `isize::MAX` even when rounded up to the alignment.

0 commit comments

Comments
 (0)