Skip to content

Conversation

lqd
Copy link
Member

@lqd lqd commented Feb 28, 2020

This reapplies @kraai's original libcore::alloc::Layout::repeat change 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

@JohnTitor JohnTitor added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 28, 2020
@Mark-Simulacrum
Copy link
Member

Given that we also have the tests in-tree that make sure we don't regress, this seems good. @bors r+

@bors
Copy link
Collaborator

bors commented Feb 28, 2020

📌 Commit 1b0bb35 has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 28, 2020
@Mark-Simulacrum Mark-Simulacrum self-assigned this Feb 28, 2020
@shahn
Copy link
Contributor

shahn commented Feb 28, 2020

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
@bors bors merged commit f548a38 into rust-lang:master Mar 2, 2020
@lqd lqd deleted the unrevert-67174 branch March 2, 2020 16:36
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants