Skip to content

Conversation

nikic
Copy link
Contributor

@nikic nikic commented May 12, 2021

This merges recent changes from the upstream LLVM 12 branch. One of them is intended to address #84958.

@rust-highfive
Copy link
Contributor

r? @cuviper

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

@rust-highfive
Copy link
Contributor

⚠️ 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 May 12, 2021
@nagisa
Copy link
Member

nagisa commented May 12, 2021

Should we include rust-lang/llvm-project#108 while at it?

@nikic
Copy link
Contributor Author

nikic commented May 13, 2021

Should we include rust-lang/llvm-project#108 while at it?

I saw that one, but it wasn't immediately obvious to me whether it's safe to backport (it touches linkage...)

@cuviper
Copy link
Member

cuviper commented May 13, 2021

Sure, let's consider that separately.

@bors r+

@bors
Copy link
Collaborator

bors commented May 13, 2021

📌 Commit f9911ae 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 May 13, 2021
@bors
Copy link
Collaborator

bors commented May 14, 2021

⌛ Testing commit f9911ae with merge 36a4d14...

@bors
Copy link
Collaborator

bors commented May 14, 2021

☀️ Test successful - checks-actions
Approved by: cuviper
Pushing 36a4d14 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 14, 2021
@bors bors merged commit 36a4d14 into rust-lang:master May 14, 2021
@rustbot rustbot added this to the 1.54.0 milestone May 14, 2021
@nikic nikic 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 May 16, 2021
@nikic
Copy link
Contributor Author

nikic commented May 16, 2021

Beta nominating this as both an abstract "backport upstream LLVM 12 fixes to beta" and as a fix for #84958 specifically.

@apiraino
Copy link
Contributor

Beta backport approved as per compiler team on Zulip

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label May 20, 2021
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.54.0, 1.53.0 May 22, 2021
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label May 22, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request May 22, 2021
…ulacrum

[beta] backports

 * Backport 1.52.1 release notes rust-lang#85404
 * remove InPlaceIterable marker from Peekable due to unsoundness rust-lang#85340
 * rustdoc: Call initSidebarItems in root module of crate rust-lang#85304
 * Update LLVM submodule rust-lang#85236
 * Do not ICE on invalid const param rust-lang#84913
 * Disallows #![feature(no_coverage)] on stable and beta (using standard crate-level gating) rust-lang#84871
 * Ensure TLS destructors run before thread joins in SGX rust-lang#84409
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.

8 participants