Skip to content

Revert pr 71840 - #72989

Merged
bors merged 7 commits into
rust-lang:masterfrom
pnkfelix:revert-pr-71840
Jun 7, 2020
Merged

Revert pr 71840#72989
bors merged 7 commits into
rust-lang:masterfrom
pnkfelix:revert-pr-71840

Conversation

@pnkfelix

@pnkfelixpnkfelix commented Jun 4, 2020

Copy link
Copy Markdown
Contributor

Revert PR #71840 to fix issue #72470

This will need a backport to beta if we do not want #72470 to hit stable.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @varkor

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 4, 2020
@pnkfelix

Copy link
Copy Markdown
ContributorAuthor

r? @matthewjasper

@pnkfelixpnkfelix added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. beta-nominated Nominated for backporting to the compiler in the beta channel. labels Jun 4, 2020
@matthewjasper

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jun 6, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit ce4c953 has been approved by matthewjasper

@borsbors 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 Jun 6, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 7, 2020
Rollup of 5 pull requests
Successful merges:
- rust-lang#72810 (validate basic sanity for TerminatorKind)
- rust-lang#72989 (Revert pr 71840)
- rust-lang#72993 (Count the beta prerelease number just from master)
- rust-lang#73057 (Clean up E0644 explanation)
- rust-lang#73059 (remove outdated comment)
Failed merges:
r? @ghost
@bors
bors merged commit 6f8760b into rust-lang:masterJun 7, 2020
@pnkfelix

Copy link
Copy Markdown
ContributorAuthor

Discussed in today's T-compiler meeting; approved for beta backport.

@pnkfelixpnkfelix added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jun 11, 2020
@Mark-SimulacrumMark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jun 13, 2020
@Mark-SimulacrumMark-Simulacrum mentioned this pull request Jun 13, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 15, 2020
…-morse,Mark-Simulacrum
[beta] backport
This is a beta backport rollup of the following:
* [beta] Revert heterogeneous SocketAddr PartialEq impls rust-lang#73318
* Fix emcc failure for wasm32. rust-lang#73213
* Revert rust-lang#71956rust-lang#73153
* [beta] Update cargo rust-lang#73141
* Minor: off-by-one error in RELEASES.md rust-lang#72914
* normalize adt fields during structural match checking rust-lang#72897
* Revert pr 71840 rust-lang#72989
* rust-lang/cargo#8361
* e658200 from rust-lang#72901
r? @ghost
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 5, 2020
…jasper
Re-land PR rust-lang#71840 (Rework MIR drop tree lowering)
PR rust-lang#71840 was reverted in rust-lang#72989 to fix an LLVM error (rust-lang#72470). That LLVM error no longer occurs with the recent upgrade to LLVM 11 (rust-lang#73526), so let's try re-landing this PR.
I've cherry-picked the commits from the original PR (with the exception of the commit blessing test output), making as few modifications as possible. I addressed the rebase fallout in separate commits on top of those.
r? `@matthewjasper`
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant 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.

6 participants

@pnkfelix@rust-highfive@matthewjasper@bors@varkor@Mark-Simulacrum