Skip to content

Check that we don't use Rvalue::Aggregate after the deaggregator#75562

Merged
bors merged 6 commits into
rust-lang:masterfrom
oli-obk:const_prop_no_aggregates
Aug 20, 2020
Merged

Check that we don't use Rvalue::Aggregate after the deaggregator#75562
bors merged 6 commits into
rust-lang:masterfrom
oli-obk:const_prop_no_aggregates

Conversation

@oli-obk

@oli-obk oli-obk commented Aug 15, 2020

Copy link
Copy Markdown
Contributor

fixes #75481

r? @wesleywiser

cc @RalfJung (modified the validator)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 15, 2020
RalfJung
RalfJung reviewed Aug 15, 2020
View reviewed changes
Comment thread src/librustc_mir/interpret/eval_context.rs Outdated
RalfJung
RalfJung reviewed Aug 15, 2020
View reviewed changes
Comment thread src/librustc_mir/transform/const_prop.rs Outdated
RalfJung
RalfJung reviewed Aug 15, 2020
View reviewed changes
Comment thread src/librustc_mir/transform/mod.rs Outdated
RalfJung
RalfJung reviewed Aug 15, 2020
View reviewed changes
Comment thread src/librustc_middle/mir/mod.rs Outdated
RalfJung
RalfJung reviewed Aug 15, 2020
View reviewed changes
Comment thread src/librustc_mir/transform/validate.rs Outdated
RalfJung
RalfJung reviewed Aug 15, 2020
View reviewed changes
Comment thread src/librustc_mir/transform/validate.rs Outdated
@oli-obk oli-obk force-pushed the const_prop_no_aggregates branch 2 times, most recently from 79f8c97 to 9f50e14 Compare August 18, 2020 06:44
RalfJung
RalfJung reviewed Aug 18, 2020
View reviewed changes
Comment thread src/librustc_middle/mir/mod.rs Outdated
RalfJung
RalfJung reviewed Aug 18, 2020
View reviewed changes
Comment thread src/librustc_middle/mir/mod.rs Outdated
RalfJung
RalfJung reviewed Aug 18, 2020
View reviewed changes
Comment thread src/librustc_mir/transform/validate.rs Outdated
RalfJung
RalfJung reviewed Aug 18, 2020
View reviewed changes
Comment thread src/librustc_middle/mir/mod.rs Outdated
RalfJung
RalfJung reviewed Aug 18, 2020
View reviewed changes
Comment thread src/librustc_middle/mir/mod.rs Outdated
RalfJung
RalfJung reviewed Aug 18, 2020
View reviewed changes
Comment thread src/librustc_mir/transform/validate.rs Outdated
RalfJung
RalfJung reviewed Aug 18, 2020
View reviewed changes
Comment thread src/librustc_mir/transform/validate.rs Outdated
RalfJung
RalfJung reviewed Aug 18, 2020
View reviewed changes
Comment thread src/librustc_middle/mir/mod.rs Outdated
RalfJung
RalfJung reviewed Aug 18, 2020
View reviewed changes
Comment thread src/librustc_middle/mir/mod.rs Outdated
RalfJung
RalfJung reviewed Aug 18, 2020
View reviewed changes
Comment thread src/librustc_mir/transform/mod.rs Outdated
RalfJung
RalfJung reviewed Aug 18, 2020
View reviewed changes
Comment thread src/librustc_middle/mir/mod.rs Outdated
RalfJung
RalfJung reviewed Aug 18, 2020
View reviewed changes
Comment thread src/librustc_mir/transform/mod.rs Outdated
RalfJung
RalfJung reviewed Aug 18, 2020
View reviewed changes
Comment thread src/librustc_mir/transform/mod.rs Outdated
RalfJung
RalfJung reviewed Aug 18, 2020
View reviewed changes
Comment thread src/librustc_mir/transform/mod.rs Outdated
RalfJung
RalfJung reviewed Aug 18, 2020
View reviewed changes
Comment thread src/librustc_mir/transform/mod.rs Outdated
RalfJung
RalfJung reviewed Aug 18, 2020
View reviewed changes
Comment thread src/librustc_mir/transform/validate.rs Outdated
RalfJung
RalfJung reviewed Aug 18, 2020
View reviewed changes
Comment thread src/librustc_mir/transform/validate.rs Outdated
RalfJung
RalfJung reviewed Aug 18, 2020
View reviewed changes
Comment thread src/librustc_mir/transform/validate.rs Outdated
RalfJung
RalfJung reviewed Aug 18, 2020
View reviewed changes
Comment thread src/librustc_mir/transform/validate.rs Outdated
@oli-obk oli-obk force-pushed the const_prop_no_aggregates branch from 744e74d to de7c836 Compare August 18, 2020 11:01
@RalfJung

RalfJung commented Aug 18, 2020

Copy link
Copy Markdown
Member

(The force-push + squashing in one go makes it impossible to only review the delta since the last time I checked...)

RalfJung
RalfJung reviewed Aug 18, 2020
View reviewed changes
Comment thread src/librustc_middle/mir/mod.rs Outdated
RalfJung
RalfJung reviewed Aug 18, 2020
View reviewed changes
Comment thread src/librustc_mir/interpret/intern.rs Outdated
RalfJung
RalfJung reviewed Aug 18, 2020
View reviewed changes
Comment thread src/librustc_mir/transform/generator.rs
@oli-obk

oli-obk commented Aug 18, 2020

Copy link
Copy Markdown
Contributor Author

(The force-push + squashing in one go makes it impossible to only review the delta since the last time I checked...)

I had to rebase, but yea, I should have made separate commits for the changes since then.

@oli-obk oli-obk force-pushed the const_prop_no_aggregates branch from d2494de to 03d38d4 Compare August 18, 2020 11:46
RalfJung
RalfJung reviewed Aug 18, 2020
View reviewed changes
Comment thread src/librustc_mir/transform/const_prop.rs
RalfJung
RalfJung approved these changes Aug 18, 2020
View reviewed changes

@RalfJung RalfJung left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Validator and MIR pass management LGTM now.
I can't check the changes in ConstProp and generator lowering, and I don't know if the mir-opt changes make sense.

Comment thread src/librustc_middle/query/mod.rs Outdated
bjorn3
bjorn3 reviewed Aug 18, 2020
View reviewed changes
Comment thread src/librustc_middle/query/mod.rs Outdated
wesleywiser
wesleywiser approved these changes Aug 20, 2020
View reviewed changes

@wesleywiser wesleywiser left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I left a few minor comments but this looks great to me overall!

Comment thread src/librustc_middle/mir/mod.rs Outdated
Comment thread src/librustc_middle/mir/mod.rs Outdated
Comment thread src/librustc_middle/query/mod.rs
Comment thread src/librustc_mir/interpret/intern.rs
Comment thread src/librustc_mir/transform/const_prop.rs Outdated
Comment thread src/tools/compiletest/src/runtest.rs
@wesleywiser

wesleywiser commented Aug 20, 2020

Copy link
Copy Markdown
Member

Since this impacts mir-optimizations:

@bors rollup=never

@oli-obk @wesleywiser
Apply suggestions from code review
dcc2027 
Co-authored-by: Wesley Wiser <wwiser@gmail.com>
@wesleywiser

wesleywiser commented Aug 20, 2020

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Aug 20, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit dcc2027 has been approved by wesleywiser

@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 Aug 20, 2020
@bors

bors commented Aug 20, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit dcc2027 with merge 814d252...

@bors bors mentioned this pull request Aug 20, 2020
Merged
@bors

bors commented Aug 20, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions, checks-azure
Approved by: wesleywiser
Pushing 814d252 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 20, 2020
@bors bors merged commit 814d252 into rust-lang:master Aug 20, 2020
This was referenced Aug 20, 2020
Merged
Merged
@oli-obk oli-obk deleted the const_prop_no_aggregates branch March 16, 2021 12:14
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RalfJung RalfJung RalfJung approved these changes

@wesleywiser wesleywiser wesleywiser approved these changes

@bjorn3 bjorn3 bjorn3 left review comments

Assignees

@wesleywiser wesleywiser

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

1.47.0

Development

Successfully merging this pull request may close these issues.

Constprop can create aggregates that won't get deaggregated anymore

7 participants

@oli-obk @RalfJung @wesleywiser @bors @bjorn3 @cuviper @rust-highfive