Unrevert "Remove checked_add in Layout::repeat"#69544
Merged
bors merged 1 commit intorust-lang:masterfrom Mar 2, 2020
Merged
Conversation
JohnTitor
added
the
S-waiting-on-review
Member
|
Given that we also have the tests in-tree that make sure we don't regress, this seems good. @bors r+ |
Collaborator
|
📌 Commit 1b0bb35 has been approved by |
bors
added
S-waiting-on-bors
Contributor
|
Thanks for that! I was offline for a bit, thanks for taking care of everything. A bit sad my patch missed the mark |
bors
added a commit
that referenced
this pull request
Mar 2, 2020
Rollup of 6 pull requests Successful merges: - #68682 (Add documentation to compiler intrinsics) - #69544 (Unrevert "Remove `checked_add` in `Layout::repeat`") - #69617 (constify mem::forget) - #69622 (Rename `syntax` in librustc_ast/README.md) - #69623 (stash API: remove panic to fix ICE.) - #69624 (Toolstate: Don't block beta week on already broken tools.) Failed merges: - #69626 (Toolstate: don't duplicate nightly tool list.) r? @ghost
This was referenced Mar 4, 2020
bors
added a commit
that referenced
this pull request
Mar 10, 2020
Rerevert "Remove checked_add in Layout::repeat" This change, which originated in #67174 and was reapplied in #69544, seems to have caused a noticeable slowdown in patched/clean incremental builds (see #69710). Revert it for now while we investigate the underlying issue. r? @nnethercote
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This reapplies @kraai's original
libcore::alloc::Layout::repeatchange from #67174 which was temporarily reverted in #69241. Now that the proper LLVM fix has been cherry-picked, we can unrevert the revert.This change was originally reviewed by @hanna-kruppe on the initial PR.
cc @RalfJung