Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-pick the LLVM fix for #69225 #69450

Merged
merged 1 commit into from Feb 26, 2020
Merged

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Feb 25, 2020

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
Collaborator

r? @nikomatsakis

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

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

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

cuviper commented Feb 25, 2020

r? @nikic

@rust-highfive rust-highfive assigned nikic and unassigned nikomatsakis Feb 25, 2020
@cuviper cuviper 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
Contributor

Centril commented Feb 25, 2020

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

I would suggest attempting to reapply it only on master.

@nikic
Copy link
Contributor

nikic commented Feb 25, 2020

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Feb 25, 2020

📌 Commit 6e84699 has been approved by nikic

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

@bors p=1

@jonas-schievink
Copy link
Contributor

@bors retry

@bors
Copy link
Contributor

bors commented Feb 25, 2020

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

@bors
Copy link
Contributor

bors commented Feb 26, 2020

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

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

pnkfelix commented Feb 27, 2020

discussed in T-compiler meeting. beta-accepted.

@pnkfelix pnkfelix added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Feb 27, 2020
@Mark-Simulacrum Mark-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 free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant 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.

None yet

10 participants