Skip to content

Commit

Permalink
Rerevert "Remove checked_add in Layout::repeat"
Browse files Browse the repository at this point in the history
  • Loading branch information
ecstatic-morse committed Mar 5, 2020
1 parent b135c73 commit 04e9877
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions src/libcore/alloc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -235,11 +235,18 @@ impl Layout {
#[unstable(feature = "alloc_layout_extra", issue = "55724")]
#[inline]
pub fn repeat(&self, n: usize) -> Result<(Self, usize), LayoutErr> {
// This cannot overflow. Quoting from the invariant of Layout:
// `padded_size` cannot overflow. Quoting from the invariant of Layout:
// > `size`, when rounded up to the nearest multiple of `align`,
// > must not overflow (i.e., the rounded value must be less than
// > `usize::MAX`)
let padded_size = self.size() + self.padding_needed_for(self.align());
//
// However, replacing this line with an `unchecked_add` or a regular `+`
// operator caused a noticeable slowdown, see #69710.
let padded_size = self
.size()
.checked_add(self.padding_needed_for(self.align()))
.ok_or(LayoutErr { private: () })?;

let alloc_size = padded_size.checked_mul(n).ok_or(LayoutErr { private: () })?;

unsafe {
Expand Down

0 comments on commit 04e9877

Please sign in to comment.