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.

Sign up for GitHub

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

Jump to bottom

[beta] Bump LLVM to a upstream 12.0 release #84271

Merged
merged 1 commit into from
Apr 24, 2021
Merged

[beta] Bump LLVM to a upstream 12.0 release #84271

merged 1 commit into from
Apr 24, 2021

Conversation

nagisa
Copy link
Member

@nagisa nagisa commented Apr 17, 2021

Currently the beta branch utilizes a release candidate of LLVM 12.0. Since then a large number of issues have been fixed upstream, including those that are known to affect Rust code.

It would be unfortunate if we released a stable Rust with all of those issues when we have the fixes in the actual LLVM release and/or our backports of commits that didn't make the release cut on top of it.

cc @cuviper / @nikic

@nagisa nagisa 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 Apr 17, 2021
@rust-highfive
Copy link
Collaborator

r? @cuviper

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!
  • 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 Apr 17, 2021
@nagisa nagisa changed the title [beta] Bump LLVM to a upstream release of 12.0 [beta] Bump LLVM to a upstream 12.0 release Apr 17, 2021
@cuviper
Copy link
Member

cuviper commented Apr 17, 2021

#84230 is already beta-nominated -- shouldn't we wait for that process?

You also pulled in the stack-probe dwarf change here, not sure if that was intentional.

@nagisa
Copy link
Member Author

nagisa commented Apr 17, 2021

Yes, it was intentional to pull in that change, though, now that I think about it, the DWARF problem is in stable already so we don't really need to backport it like we should with the others.

@nagisa nagisa closed this Apr 17, 2021
@nagisa
Copy link
Member Author

nagisa commented Apr 17, 2021

Ah, I was wrong. while it would've reached stable, it did not because of #83412 and so it is valuable to consider this for backport, including separately from the other LLVM 12.0 backport.

@nagisa nagisa reopened this Apr 17, 2021
@wesleywiser wesleywiser mentioned this pull request Apr 22, 2021
Merged
@wesleywiser
Copy link
Member

We discussed this in the compiler team triage meeting and decided to approve the backport.

@wesleywiser wesleywiser added beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. and removed beta-nominated Nominated for backporting to the compiler in the beta channel. labels Apr 22, 2021
@cuviper
Copy link
Member

cuviper commented Apr 22, 2021

@bors r

@bors
Copy link
Contributor

bors commented Apr 22, 2021

📌 Commit 46a2c6a has been approved by cuviper

@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 Apr 22, 2021
@bors
Copy link
Contributor

bors commented Apr 24, 2021

⌛ Testing commit 46a2c6a with merge cc6d66f...

@bors
Copy link
Contributor

bors commented Apr 24, 2021

☀️ Test successful - checks-actions
Approved by: cuviper
Pushing cc6d66f to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 24, 2021
@bors bors merged commit cc6d66f into rust-lang:beta Apr 24, 2021
@rustbot rustbot added this to the 1.52.0 milestone Apr 24, 2021
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 26, 2021
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Apr 30, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@cuviper cuviper

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
Milestone
1.52.0
Development

Successfully merging this pull request may close these issues.
6 participants
@nagisa @rust-highfive @cuviper @wesleywiser @bors @rustbot