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

Rebase LLVM onto 11.0.0-rc3 #77063

Merged
merged 1 commit into from
Sep 23, 2020
Merged

Rebase LLVM onto 11.0.0-rc3 #77063

merged 1 commit into from
Sep 23, 2020

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Sep 22, 2020

r? @nikic

@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 Sep 22, 2020
@cuviper
Copy link
Member Author

cuviper commented Sep 22, 2020

This is a rebased branch instead of a merge, per rust-lang/llvm-project#75 (comment).

@nikic
Copy link
Contributor

nikic commented Sep 22, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Sep 22, 2020

📌 Commit 883a7a5 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 Sep 22, 2020
@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 Sep 22, 2020
@nikic
Copy link
Contributor

nikic commented Sep 22, 2020

Also nominating this for beta backport, as it will fix at least some reported LLVM 11 regressions (like #76042).

@ecstatic-morse
Copy link
Contributor

@bors rollup=never p=1

@bors
Copy link
Contributor

bors commented Sep 23, 2020

⌛ Testing commit 883a7a5 with merge e62323d...

@bors
Copy link
Contributor

bors commented Sep 23, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: nikic
Pushing e62323d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 23, 2020
@bors bors merged commit e62323d into rust-lang:master Sep 23, 2020
@rustbot rustbot added this to the 1.48.0 milestone Sep 23, 2020
@matthiaskrgr matthiaskrgr mentioned this pull request Sep 23, 2020
Closed
@tspiteri tspiteri mentioned this pull request Sep 24, 2020
Closed
@Mark-Simulacrum
Copy link
Member

This implicitly includes backports of 39a3517 and 1d2290f -- is that expected, @cuviper? If not we'll probably want another branch or something like that.

@cuviper
Copy link
Member Author

cuviper commented Sep 28, 2020

It is expected since those were already here on master, but some of our patches are also now part of upstream 11-rc3. You could rewind to rust-lang/llvm-project@1c6c71f if you just want to avoid our later backports in the beta branch.

@cuviper
Copy link
Member Author

cuviper commented Sep 28, 2020

Here's the branch comparison for this PR's submodule update, so you can see where I picked that commit at the end:
rust-lang/llvm-project@a78defc...7075196

@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Sep 28, 2020
Merged
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.48.0, 1.47.0 Sep 28, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 29, 2020
@bors
Auto merge of rust-lang#77308 - Mark-Simulacrum:beta-next, r=Mark-Sim…
9f0e6fa 
…ulacrum

[beta] backports

This backports the following:
 *  revert const_type_id stabilization rust-lang#77083
 * [mir-opt] Disable the `ConsideredEqual` logic in SimplifyBranchSame opt rust-lang#76837
 * Rename Iterator::get_unchecked rust-lang#77201 (manually, because of file renaming and other issues on master causing literal cherry-pick to fail)
 *  Rebase LLVM onto 11.0.0-rc3 rust-lang#77063 (bumping direct to master, see rust-lang#77063 (comment)).

The last two have not yet been approved by compiler team, but I'm posting this now and going to go ahead and approve as I expect both to get approved and we want testing as much as possible before release in ~2 weeks.

r? `@ghost`
@spastorino
Copy link
Member

discussed in T-compiler meeting.

@rustbot modify labels: beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Sep 30, 2020
@cuviper
Copy link
Member Author

cuviper commented Sep 30, 2020

It was preemptively included in #77308.

@rustbot modify labels: -beta-nominated

@rustbot rustbot removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 30, 2020
@cuviper cuviper deleted the llvm-11.0.0-rc3 branch September 21, 2021 16:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nikic nikic

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.47.0
Development

Successfully merging this pull request may close these issues.
8 participants
@cuviper @rust-highfive @nikic @bors @ecstatic-morse @Mark-Simulacrum @spastorino @rustbot