Skip to content

rustc_mir: insert a dummy access to places being matched on, when building MIR.#48092

Merged
bors merged 2 commits intorust-lang:masterfrom
eddyb:discriminate-the-void
Feb 11, 2018
Merged

rustc_mir: insert a dummy access to places being matched on, when building MIR.#48092
bors merged 2 commits intorust-lang:masterfrom
eddyb:discriminate-the-void

Conversation

@eddyb
Copy link
Member

@eddyb eddyb commented Feb 9, 2018 •
edited
Loading

Fixes #47412 by adding a _dummy = Discriminant(place) before each match place {...}.

r? @nikomatsakis

@eddyb eddyb added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 9, 2018
@eddyb eddyb force-pushed the discriminate-the-void branch from 4282b4c to 8af134e Compare February 9, 2018 21:26
@shepmaster shepmaster added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 9, 2018
@nikomatsakis
Copy link
Contributor

nikomatsakis commented Feb 9, 2018

@bors r+

cc @pnkfelix -- hopefully we can do better once your work is done

@bors
Copy link
Collaborator

bors commented Feb 9, 2018

📌 Commit 8af134e has been approved by nikomatsakis

@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 Feb 9, 2018
@nikomatsakis
Copy link
Contributor

nikomatsakis commented Feb 9, 2018

@bors p=1 -- high priority fix

@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Feb 9, 2018

@bors p=5

@bors
Copy link
Collaborator

bors commented Feb 10, 2018

⌛ Testing commit 8af134e with merge 36a3cf12bfedf203399976f6cebf562ffc0fbb64...

@bors
Copy link
Collaborator

bors commented Feb 10, 2018

💔 Test failed - status-travis

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 10, 2018
@eddyb
Copy link
Member Author

eddyb commented Feb 10, 2018

@bors retry

  • rubygems download failure

@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 Feb 10, 2018
@bors
Copy link
Collaborator

bors commented Feb 10, 2018

⌛ Testing commit 8af134e with merge 8d9854a2a81f0cfec44c3e9990fef05b568ca9fc...

@bors
Copy link
Collaborator

bors commented Feb 10, 2018

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 10, 2018
@eddyb
Copy link
Member Author

eddyb commented Feb 10, 2018

@bors retry

  • appveyor timeout?

@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 Feb 10, 2018
@bors
Copy link
Collaborator

bors commented Feb 10, 2018

⌛ Testing commit 8af134e with merge 89dca1522d45966ebf00973c98530bb726e9e24e...

@bors
Copy link
Collaborator

bors commented Feb 10, 2018

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 10, 2018
@eddyb
Copy link
Member Author

eddyb commented Feb 10, 2018

@bors retry

@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 Feb 10, 2018
@bors
Copy link
Collaborator

bors commented Feb 11, 2018

⌛ Testing commit 8af134e with merge 7f2baba...

bors added a commit that referenced this pull request Feb 11, 2018
@bors
Auto merge of #48092 - eddyb:discriminate-the-void, r=nikomatsakis
7f2baba 
 rustc_mir: insert a dummy access to places being matched on, when building MIR.

Fixes #47412 by adding a `_dummy = Discriminant(place)` before each `match place {...}`.

r? @nikomatsakis
@bors
Copy link
Collaborator

bors commented Feb 11, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing 7f2baba to master...

@bors bors merged commit 8af134e into rust-lang:master Feb 11, 2018
@bors bors mentioned this pull request Feb 11, 2018
Closed
@eddyb eddyb deleted the discriminate-the-void branch February 11, 2018 09:11
@eddyb
Copy link
Member Author

eddyb commented Feb 11, 2018

@nikomatsakis We should figure out the backporting situation ASAP.

@bluss bluss added the relnotes Marks issues that should be documented in the release notes of the next release. label Feb 11, 2018
@kennytm kennytm mentioned this pull request Feb 11, 2018
Closed
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Feb 11, 2018
Merged
@alexcrichton alexcrichton added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Feb 11, 2018
bors added a commit that referenced this pull request Feb 12, 2018
@bors
Auto merge of #48146 - Mark-Simulacrum:beta-next, r=alexcrichton
ed2c0f0 
[beta] Release notes, dist with time crate, and #48092

Backports of
 - #48092
 - #48013
 - #47286
 - #48144
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 12, 2018
@solson solson mentioned this pull request Mar 25, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nikomatsakis nikomatsakis nikomatsakis approved these changes

Assignees

@nikomatsakis nikomatsakis

Labels

beta-accepted Accepted for backporting to the compiler in the beta channel. relnotes Marks issues that should be documented in the release notes of the next release. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@eddyb @nikomatsakis @bors @Mark-Simulacrum @alexcrichton @shepmaster @bluss