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

Revert #71956 #73153

Merged
merged 2 commits into from
Jun 9, 2020
Merged

Revert #71956 #73153

merged 2 commits into from
Jun 9, 2020

Conversation

ecstatic-morse
Copy link
Contributor

@ecstatic-morse ecstatic-morse commented Jun 8, 2020

Revert #71956 since it caused unsoundness in #73137. Also adds a reduced version of #73137 to the test suite. The addition of the MaybeInitializedLocals dataflow analysis has not been reverted, but it is no longer used.

Presumably there is a more targeted fix, but I'm worried that other bugs may be lurking. I'm not yet sure what the root cause of #73137 is.

This will need to get backported to beta.

r? @tmandry

@ecstatic-morse ecstatic-morse added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jun 8, 2020
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 8, 2020
@tmandry
Copy link
Member

tmandry commented Jun 8, 2020

@bors r+ p=2

@bors
Copy link
Contributor

bors commented Jun 8, 2020

📌 Commit 452f9f93eb09d8e0ec6d06d89ce16ed034301573 has been approved by tmandry

@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 Jun 8, 2020
@jonas-schievink jonas-schievink added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jun 8, 2020
@ecstatic-morse
Copy link
Contributor Author

Mistake in the test case

@bors r=tmandry

@bors
Copy link
Contributor

bors commented Jun 8, 2020

📌 Commit c285ab6949bf7e62524f43307f76fb2290cef236 has been approved by tmandry

@ecstatic-morse
Copy link
Contributor Author

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 8, 2020
@ecstatic-morse ecstatic-morse force-pushed the revert-71956 branch 2 times, most recently from 3802363 to 48358e5 Compare June 8, 2020 23:35
Co-authored-by: Aaron1011 <aa1ronham@gmail.com>
@ecstatic-morse
Copy link
Contributor Author

@bors r=tmandry

The test is now a bit more robust, and I found the right Co-authored-by syntax. A source-level regression test is not the best for bugs like these, but it was the best I could do on short notice.

@bors
Copy link
Contributor

bors commented Jun 9, 2020

📌 Commit b6121a5 has been approved by tmandry

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 9, 2020
@bors
Copy link
Contributor

bors commented Jun 9, 2020

⌛ Testing commit b6121a5 with merge ccac43b...

@bors
Copy link
Contributor

bors commented Jun 9, 2020

☀️ Test successful - checks-azure
Approved by: tmandry
Pushing ccac43b to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 9, 2020
@bors bors merged commit ccac43b into rust-lang:master Jun 9, 2020
@ecstatic-morse
Copy link
Contributor Author

Nominating for @rust-lang/compiler. We need to backport this to beta.

@pnkfelix
Copy link
Member

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

@pnkfelix pnkfelix added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jun 11, 2020
@Mark-Simulacrum Mark-Simulacrum removed I-nominated beta-nominated Nominated for backporting to the compiler in the beta channel. labels 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#71956 rust-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
@ecstatic-morse ecstatic-morse deleted the revert-71956 branch October 6, 2020 01:42
@cuviper cuviper added this to the 1.46 milestone May 2, 2024
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