Skip to content

Cherry-pick the LLVM fix for #69225 - #69450

Merged
bors merged 1 commit into
rust-lang:masterfrom
cuviper:llvm-scev-no-wrap
Feb 26, 2020
Merged

Cherry-pick the LLVM fix for #69225#69450
bors merged 1 commit into
rust-lang:masterfrom
cuviper:llvm-scev-no-wrap

Conversation

@cuviper

@cuvipercuviper commented Feb 25, 2020

Copy link
Copy Markdown
Member

An additional reproducer was provided in #69225 -- the new testcase here -- which still crashes even after #69241 reverted #67174. Now this pull request updates LLVM with the cherry-picked reversion of its own. This is also going to stable in #69444.

I have not tried to reapply #67174 yet -- cc @kraai@shahn

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive

Copy link
Copy Markdown
Contributor

⚠️Warning⚠️

  • These commits modify submodules.

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 25, 2020
@cuviper

Copy link
Copy Markdown
MemberAuthor

r? @nikic

@cuvipercuviper added beta-nominated Nominated for backporting to the compiler in the beta channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 25, 2020
@Centril

Copy link
Copy Markdown
Contributor

I have not tried to reapply #67174 yet -- cc @kraai@shahn

I would suggest attempting to reapply it only on master.

@nikic

Copy link
Copy Markdown
Contributor

@bors r+ rollup=never

@bors

bors commented Feb 25, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 6e84699 has been approved by nikic

@borsbors 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 25, 2020
@Dylan-DPC-zz

Copy link
Copy Markdown

@bors p=1

@jonas-schievink

Copy link
Copy Markdown
Contributor

@bors retry

@bors

bors commented Feb 25, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 6e84699 with merge 55a777c...

@bors

bors commented Feb 26, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: nikic
Pushing 55a777c to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Feb 26, 2020
@bors
bors merged commit 55a777c into rust-lang:masterFeb 26, 2020
@pnkfelix

pnkfelix commented Feb 27, 2020

Copy link
Copy Markdown
Contributor

discussed in T-compiler meeting. beta-accepted.

@pnkfelixpnkfelix added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Feb 27, 2020
@Mark-SimulacrumMark-Simulacrum mentioned this pull request Feb 28, 2020
@Mark-SimulacrumMark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 28, 2020
bors added a commit that referenced this pull request Feb 28, 2020
[beta] backports
This backports the following PRs:
* ci: switch macOS builders to 10.15 #68863
* Backport release notes of 1.41.1 #69468
* Cherry-pick the LLVM fix for #69225#69450
* `lit_to_const`: gracefully bubble up type errors. #69330
* [beta] bootstrap from 1.41.1 stable #69518
* bootstrap: Configure cmake when building sanitizer runtimes #69104
r? @ghost
@cuviper
cuviper deleted the llvm-scev-no-wrap branch April 3, 2020 18:37
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants

@cuviper@rust-highfive@Centril@nikic@bors@Dylan-DPC-zz@jonas-schievink@pnkfelix@nikomatsakis@Mark-Simulacrum