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

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.

Sign up for GitHub

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

Jump to bottom

Merged

bors merged 6 commits into rust-lang:master from oli-obk:const_prop_no_aggregates

Aug 20, 2020

Contributor

oli-obk commented Aug 15, 2020

fixes #75481

r? @wesleywiser

cc @RalfJung (modified the validator)

rust-highfive assigned wesleywiser

rust-highfive added the S-waiting-on-review label

RalfJung reviewed

View reviewed changes

src/librustc_mir/interpret/eval_context.rs Outdated Show resolved Hide resolved

RalfJung reviewed

View reviewed changes

src/librustc_mir/transform/const_prop.rs Outdated Show resolved Hide resolved

RalfJung reviewed

View reviewed changes

src/librustc_mir/transform/mod.rs Outdated Show resolved Hide resolved

RalfJung reviewed

View reviewed changes

src/librustc_middle/mir/mod.rs Outdated Show resolved Hide resolved

RalfJung reviewed

View reviewed changes

src/librustc_mir/transform/validate.rs Outdated Show resolved Hide resolved

RalfJung reviewed

View reviewed changes

src/librustc_mir/transform/validate.rs Outdated Show resolved Hide resolved

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 reviewed

View reviewed changes

src/librustc_middle/mir/mod.rs Outdated Show resolved Hide resolved

RalfJung reviewed

View reviewed changes

src/librustc_middle/mir/mod.rs Outdated Show resolved Hide resolved

RalfJung reviewed

View reviewed changes

src/librustc_mir/transform/validate.rs Outdated Show resolved Hide resolved

RalfJung reviewed

View reviewed changes

src/librustc_middle/mir/mod.rs Outdated Show resolved Hide resolved

RalfJung reviewed

View reviewed changes

src/librustc_middle/mir/mod.rs Outdated Show resolved Hide resolved

RalfJung reviewed

View reviewed changes

src/librustc_mir/transform/validate.rs Outdated Show resolved Hide resolved

RalfJung reviewed

View reviewed changes

src/librustc_mir/transform/validate.rs Outdated Show resolved Hide resolved

RalfJung reviewed

View reviewed changes

src/librustc_middle/mir/mod.rs Outdated Show resolved Hide resolved

RalfJung reviewed

View reviewed changes

src/librustc_middle/mir/mod.rs Outdated Show resolved Hide resolved

RalfJung reviewed

View reviewed changes

src/librustc_mir/transform/mod.rs Outdated Show resolved Hide resolved

RalfJung reviewed

View reviewed changes

src/librustc_middle/mir/mod.rs Outdated Show resolved Hide resolved

RalfJung reviewed

View reviewed changes

src/librustc_mir/transform/mod.rs Outdated Show resolved Hide resolved

RalfJung reviewed

View reviewed changes

src/librustc_mir/transform/mod.rs Outdated Show resolved Hide resolved

RalfJung reviewed

View reviewed changes

src/librustc_mir/transform/mod.rs Outdated Show resolved Hide resolved

RalfJung reviewed

View reviewed changes

src/librustc_mir/transform/mod.rs Outdated Show resolved Hide resolved

RalfJung reviewed

View reviewed changes

src/librustc_mir/transform/validate.rs Outdated Show resolved Hide resolved

RalfJung reviewed

View reviewed changes

src/librustc_mir/transform/validate.rs Outdated Show resolved Hide resolved

RalfJung reviewed

View reviewed changes

src/librustc_mir/transform/validate.rs Outdated Show resolved Hide resolved

RalfJung reviewed

View reviewed changes

src/librustc_mir/transform/validate.rs Outdated Show resolved Hide resolved


          Validate the MIR of all optimizations in the mir-opt directory

de7c836

oli-obk force-pushed the const_prop_no_aggregates branch from 744e74d to de7c836 Compare

August 18, 2020 11:01

Member

RalfJung commented Aug 18, 2020

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

RalfJung reviewed

View reviewed changes

src/librustc_middle/mir/mod.rs Outdated Show resolved Hide resolved

RalfJung reviewed

View reviewed changes

src/librustc_mir/interpret/intern.rs Outdated Show resolved Hide resolved

RalfJung reviewed

View reviewed changes

src/librustc_mir/transform/generator.rs Show resolved Hide resolved

Contributor Author

oli-obk commented Aug 18, 2020

(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.


          Address review comments

03d38d4

oli-obk force-pushed the const_prop_no_aggregates branch from d2494de to 03d38d4 Compare

August 18, 2020 11:46

RalfJung reviewed

View reviewed changes

src/librustc_mir/transform/const_prop.rs Show resolved Hide resolved


          Explain why we are creating an aggregate constant

39a114e

RalfJung approved these changes

View reviewed changes

Member

RalfJung left a comment

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.

src/librustc_middle/query/mod.rs Outdated Show resolved Hide resolved


          Elaborate docs on the promoted_mir query

acad574

bjorn3 reviewed

View reviewed changes

src/librustc_middle/query/mod.rs Outdated Show resolved Hide resolved


          Typo

f0bae67

wesleywiser approved these changes

View reviewed changes

Member

wesleywiser left a comment

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

src/librustc_middle/mir/mod.rs Outdated Show resolved Hide resolved

src/librustc_middle/mir/mod.rs Outdated Show resolved Hide resolved

src/librustc_middle/query/mod.rs Show resolved Hide resolved

src/librustc_mir/interpret/intern.rs Show resolved Hide resolved

src/librustc_mir/transform/const_prop.rs Outdated Show resolved Hide resolved

src/tools/compiletest/src/runtest.rs Show resolved Hide resolved

Member

wesleywiser commented Aug 20, 2020

Since this impacts mir-optimizations:

@bors rollup=never


          Apply suggestions from code review

dcc2027

Co-authored-by: Wesley Wiser <wwiser@gmail.com>

Member

wesleywiser commented Aug 20, 2020

Collaborator

bors commented Aug 20, 2020

📌 Commit dcc2027 has been approved by wesleywiser

bors added S-waiting-on-bors and removed S-waiting-on-review labels

Collaborator

bors commented Aug 20, 2020

⌛ Testing commit dcc2027 with merge 814d252...

bors mentioned this pull request

Enable stack-overflow detection on musl for non-main threads #75703

Merged

Collaborator

bors commented Aug 20, 2020

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

bors added the merged-by-bors label

bors merged commit 814d252 into rust-lang:master

This was referenced Aug 20, 2020

Implement multiple return terminator optimization #74839

Merged

Suppress "const" prefix of FnDef constants in MIR dump #75697

Merged

oli-obk deleted the const_prop_no_aggregates branch

March 16, 2021 12:14

cuviper added this to the 1.47.0 milestone

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-bors S-waiting-on-bors