Skip to content

/rust

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

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

Merged
merged 2 commits into from Feb 11, 2018

Conversation

Reviewers

@nikomatsakis nikomatsakis

Assignees

@nikomatsakis nikomatsakis

Labels
S-waiting-on-bors beta-accepted relnotes
Projects
None yet
Milestone
No milestone
7 participants
@eddyb @nikomatsakis @bors @Mark-Simulacrum @alexcrichton @shepmaster @bluss
@eddyb
Copy link
Member

eddyb commented Feb 9, 2018 •
edited

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

r? @nikomatsakis

@eddyb eddyb added the beta-nominated label Feb 9, 2018

@rust-highfive rust-highfive assigned nikomatsakis Feb 9, 2018

@eddyb eddyb force-pushed the eddyb:discriminate-the-void branch from 4282b4c to 8af134e Feb 9, 2018

@shepmaster shepmaster added the S-waiting-on-review label Feb 9, 2018

@nikomatsakis

nikomatsakis approved these changes Feb 9, 2018
View changes

@nikomatsakis

This comment has been minimized.

Sign in to view
Copy link
Contributor

nikomatsakis commented Feb 9, 2018

@bors r+

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

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Feb 9, 2018

📌 Commit 8af134e has been approved by nikomatsakis

@bors bors added S-waiting-on-bors and removed S-waiting-on-review labels Feb 9, 2018

@nikomatsakis

This comment has been minimized.

Sign in to view
Copy link
Contributor

nikomatsakis commented Feb 9, 2018

@bors p=1 -- high priority fix
@Mark-Simulacrum

This comment has been minimized.

Sign in to view
Copy link
Member

Mark-Simulacrum commented Feb 9, 2018

@bors p=5
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Feb 10, 2018

⌛️ Testing commit 8af134e with merge 36a3cf1...

bors added a commit that referenced this pull request Feb 10, 2018

@bors
Auto merge of #48092 - eddyb:discriminate-the-void, r=nikomatsakis 
 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
Loading status checks…
36a3cf1
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Feb 10, 2018

💔 Test failed - status-travis

@bors bors added S-waiting-on-review and removed S-waiting-on-bors labels Feb 10, 2018

@eddyb

This comment has been minimized.

Sign in to view
Copy link
Member Author

eddyb commented Feb 10, 2018

@bors retry

  • rubygems download failure

@bors bors added S-waiting-on-bors and removed S-waiting-on-review labels Feb 10, 2018

@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Feb 10, 2018

⌛️ Testing commit 8af134e with merge 8d9854a...

bors added a commit that referenced this pull request Feb 10, 2018

@bors
Auto merge of #48092 - eddyb:discriminate-the-void, r=nikomatsakis 
 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
Loading status checks…
8d9854a
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Feb 10, 2018

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review and removed S-waiting-on-bors labels Feb 10, 2018

@eddyb

This comment has been minimized.

Sign in to view
Copy link
Member Author

eddyb commented Feb 10, 2018

@bors retry

  • appveyor timeout?

@bors bors added S-waiting-on-bors and removed S-waiting-on-review labels Feb 10, 2018

@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Feb 10, 2018

⌛️ Testing commit 8af134e with merge 89dca15...

bors added a commit that referenced this pull request Feb 10, 2018

@bors
Auto merge of #48092 - eddyb:discriminate-the-void, r=nikomatsakis 
 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
Loading status checks…
89dca15
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Feb 10, 2018

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review and removed S-waiting-on-bors labels Feb 10, 2018

@eddyb

This comment has been minimized.

Sign in to view
Copy link
Member Author

eddyb commented Feb 10, 2018

@bors retry

@bors bors added S-waiting-on-bors and removed S-waiting-on-review labels Feb 10, 2018

@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

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 
 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
Loading status checks…
7f2baba
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

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
2 checks passed

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details

@bors bors referenced this pull request Feb 11, 2018

Closed

Eager unreachable blocks for `!` type #47291

@eddyb eddyb deleted the eddyb:discriminate-the-void branch Feb 11, 2018

@eddyb

This comment has been minimized.

Sign in to view
Copy link
Member Author

eddyb commented Feb 11, 2018

@nikomatsakis We should figure out the backporting situation ASAP.

@bluss bluss added the relnotes label Feb 11, 2018

@kennytm kennytm referenced this pull request Feb 11, 2018

Closed

Spurious (?) error in "compile-fail\rfc-2126-extern-in-paths\single-segment.rs" etc #48116

@Mark-Simulacrum Mark-Simulacrum referenced this pull request Feb 11, 2018

Merged

[beta] Release notes, dist with time crate, and #48092 #48146

@alexcrichton alexcrichton added the beta-accepted label Feb 11, 2018

bors added a commit that referenced this pull request Feb 11, 2018

@bors
Auto merge of #48146 - Mark-Simulacrum:beta-next, r=alexcrichton 
[beta] Release notes, dist with time crate, and #48092

Backports of
 - #48092
 - #48013
 - #47286
Loading status checks…
29b633c

bors added a commit that referenced this pull request Feb 12, 2018

@bors
Auto merge of #48146 - Mark-Simulacrum:beta-next, r=alexcrichton 
[beta] Release notes, dist with time crate, and #48092

Backports of
 - #48092
 - #48013
 - #47286
Loading status checks…
bc4f762

bors added a commit that referenced this pull request Feb 12, 2018

@bors
Auto merge of #48146 - Mark-Simulacrum:beta-next, r=alexcrichton 
[beta] Release notes, dist with time crate, and #48092

Backports of
 - #48092
 - #48013
 - #47286
Loading status checks…
9737400

bors added a commit that referenced this pull request Feb 12, 2018

@bors
Auto merge of #48146 - Mark-Simulacrum:beta-next, r=alexcrichton 
[beta] Release notes, dist with time crate, and #48092

Backports of
 - #48092
 - #48013
 - #47286
 - #48144
Loading status checks…
ed2c0f0

@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated label Feb 12, 2018

@solson solson referenced this pull request Mar 25, 2018

Closed

Rustc creates invalid mir for core::cell::BorrowRef::new #49327

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.