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

[stable] Cherry-pick LLVM fix for 1.41.1 #69444

Merged
merged 2 commits into from
Feb 25, 2020

Conversation

pietroalbini
Copy link
Member

This PR cherry-picks the LLVM patch required to properly fix #69225 on 1.41.1, and adds a test to make sure the fix works.

r? @ghost

@pietroalbini
Copy link
Member Author

pietroalbini commented Feb 24, 2020

@bors r+ p=1000

Pre-approving this to get dev artifacts up as soon as possible. Even if this PR merges and we then decide not to go with this approach, we can always do the release with the previously built artifacts.


@rust-lang/compiler @rust-lang/release the reasoning for this LLVM backport is explained at #69225 (comment). Part of release team discussed this on Discord and agree we should want this, but we should get wider consensus before deciding to actually ship the changes merged by this PR.

r? @Mark-Simulacrum
cc @dfyz

@bors
Copy link
Contributor

bors commented Feb 24, 2020

📌 Commit acb2399 has been approved by pietroalbini

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 24, 2020
@bors

This comment has been minimized.

@bors

This comment has been minimized.

@bors

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Feb 24, 2020

⌛ Testing commit acb2399 with merge f3e1a95...

@Centril
Copy link
Contributor

Centril commented Feb 24, 2020

@bors treeclosed=100

@rust-highfive

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Feb 25, 2020

☀️ Test successful - checks-azure
Approved by: pietroalbini
Pushing f3e1a95 to stable...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 25, 2020
@bors bors merged commit f3e1a95 into rust-lang:stable Feb 25, 2020
@pietroalbini pietroalbini deleted the stable-next-final-v2-new branch February 25, 2020 09:32
bors added a commit that referenced this pull request Feb 25, 2020
Cherry-pick the LLVM fix for #69225

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
@dfyz
Copy link
Contributor

dfyz commented Feb 25, 2020

we should get wider consensus before deciding to actually ship the changes merged by this PR

I'm a little confused about the current status on this. Do you have consensus on which version will actually be shipped?

By the way, I really appreciate the hard work that went into rebuilding the release at the last minute. Sorry for messing with your sleep schedules. 🙁

@Mark-Simulacrum
Copy link
Member

We're currently planning on releasing the new version (i.e., with the LLVM backport).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants