Skip to content

[const-prop] Handle remaining MIR Rvalue cases #64890

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 7 commits into from
Oct 19, 2019
Merged

[const-prop] Handle remaining MIR Rvalue cases #64890

merged 7 commits into from
Oct 19, 2019

Conversation

wesleywiser
Copy link
Member

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 29, 2019
@wesleywiser wesleywiser force-pushed the const_prop_rvalue branch 2 times, most recently from d8549cb to 4982dae Compare September 30, 2019 12:24
@oli-obk
Copy link
Contributor

oli-obk commented Sep 30, 2019

just a formatting nit, then this lgtm.

@wesleywiser wesleywiser force-pushed the const_prop_rvalue branch 2 times, most recently from c3cdb89 to 5804c3b Compare September 30, 2019 12:47
@oli-obk
Copy link
Contributor

oli-obk commented Sep 30, 2019

@bors r+

@bors
Copy link
Collaborator

bors commented Sep 30, 2019

📌 Commit 5804c3b has been approved by oli-obk

@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 30, 2019
Centril added a commit to Centril/rust that referenced this pull request Oct 1, 2019
@Centril
Rollup merge of rust-lang#64890 - wesleywiser:const_prop_rvalue, r=ol…
8436080 
…i-obk

[const-prop] Handle remaining MIR Rvalue cases

r? @oli-obk
@Centril Centril mentioned this pull request Oct 1, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Oct 1, 2019
@Centril
Rollup merge of rust-lang#64890 - wesleywiser:const_prop_rvalue, r=ol…
aab99cf 
…i-obk

[const-prop] Handle remaining MIR Rvalue cases

r? @oli-obk
@Centril Centril mentioned this pull request Oct 1, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Oct 1, 2019
@Centril
Rollup merge of rust-lang#64890 - wesleywiser:const_prop_rvalue, r=ol…
4707702 
…i-obk

[const-prop] Handle remaining MIR Rvalue cases

r? @oli-obk
@Centril Centril mentioned this pull request Oct 1, 2019
Closed
@Centril
Copy link
Contributor

Centril commented Oct 1, 2019

(Speculation) Failed in #64955 (comment), @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 Oct 1, 2019
@bjorn3
Copy link
Member

bjorn3 commented Oct 1, 2019

Assertion location:

rust/src/librustc_mir/interpret/place.rs

Line 1032 in 702b45e

assert_eq!(index, variant_index);

@joelpalmer
Copy link

Ping from Triage: any updates @wesleywiser?

@wesleywiser
Copy link
Member Author

Got married this weekend; I'll probably get back to this later this week :)

@wesleywiser
Copy link
Member Author

@oli-obk Pushed a fix. Let me know what you think.

@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 Oct 18, 2019
@wesleywiser
Copy link
Member Author

A mir-opt test I added failed because wasm doesn't support unwinding. I'll fix this tonight.

@wesleywiser
Copy link
Member Author

Added ignore-{wasm,enscripten} to the box test.

@bors r=oli-obk

@bors
Copy link
Collaborator

bors commented Oct 18, 2019

📌 Commit fd20dbe has been approved by oli-obk

@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 Oct 18, 2019
@bors
Copy link
Collaborator

bors commented Oct 19, 2019

⌛ Testing commit fd20dbe with merge bf46d1b81e0f1be41abd66dabb21515f6d0bfdc7...

@Centril
Copy link
Contributor

Centril commented Oct 19, 2019

@bors rollup=never retry yielding to r0llup

@bors
Copy link
Collaborator

bors commented Oct 19, 2019

⌛ Testing commit fd20dbe with merge 662301e2a9170f3aba36b6f4df7fec1309606866...

@Centril
Copy link
Contributor

Centril commented Oct 19, 2019

@bors retry yielding to r0llup

@bors
Copy link
Collaborator

bors commented Oct 19, 2019

⌛ Testing commit fd20dbe with merge e5b8c11...

bors added a commit that referenced this pull request Oct 19, 2019
@bors
Auto merge of #64890 - wesleywiser:const_prop_rvalue, r=oli-obk
e5b8c11 
[const-prop] Handle remaining MIR Rvalue cases

r? @oli-obk
@RalfJung RalfJung mentioned this pull request Oct 19, 2019
Merged
@bors
Copy link
Collaborator

bors commented Oct 19, 2019

☀️ Test successful - checks-azure
Approved by: oli-obk
Pushing e5b8c11 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 19, 2019
@bors bors merged commit fd20dbe into rust-lang:master Oct 19, 2019
Centril added a commit to Centril/rust that referenced this pull request Oct 20, 2019
@Centril
Rollup merge of rust-lang#65592 - RalfJung:const-prop-comment, r=wesl…
f8d1c35 
…eywiser

clarify const_prop ICE protection comment

This is based on discussion at https://github.com/rust-lang/rust/pull/64890/files#r334555787.

That said, why are function arguments the only unsized locals that could remain uninitialized? Couldn't we also fail to initialize some local but still go on with const_prop, and then hit a line that takes a reference to that? Cc @wesleywiser @oli-obk ; I don't know enough about const-prop to understand why this can happen only for function arguments.

~~The PR includes rust-lang#64890; the only new commit is 05e4e6ba0d5.~~
@wesleywiser wesleywiser mentioned this pull request Oct 22, 2019
Merged
bors added a commit that referenced this pull request Oct 30, 2019
@bors
Auto merge of #65694 - wesleywiser:uninhabited_enum_variants_pass, r=…
f9d5de7 
…<try>

[mir-opt] Implement pass to remove branches on uninhabited variants

Based on discussion [here](#64890 (comment)), this is a pass to eliminate dead code that is caused by branching on an enum with uninhabited variants.

r? @oli-obk
bors added a commit that referenced this pull request Nov 9, 2019
@bors
Auto merge of #65694 - wesleywiser:uninhabited_enum_variants_pass, r=…
c296b2d 
…oli-obk

[mir-opt] Implement pass to remove branches on uninhabited variants

Based on discussion [here](#64890 (comment)), this is a pass to eliminate dead code that is caused by branching on an enum with uninhabited variants.

r? @oli-obk
@bytwise bytwise mentioned this pull request Dec 2, 2019
Closed
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@RalfJung RalfJung RalfJung left review comments

@oli-obk oli-obk oli-obk left review comments

@memoryruins memoryruins memoryruins left review comments

@bjorn3 bjorn3 bjorn3 left review comments

Assignees

@oli-obk oli-obk

Labels
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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@wesleywiser @oli-obk @bors @Centril @bjorn3 @joelpalmer @rust-highfive @RalfJung @tmandry @memoryruins