Skip to content
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

Propagate locals, even if they have unpropagatable assignments somewhere #72135

Merged
merged 4 commits into from
May 17, 2020
Merged

Propagate locals, even if they have unpropagatable assignments somewhere #72135

merged 4 commits into from
May 17, 2020

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented May 12, 2020

Second try for #71946 (comment)

r? @wesleywiser

cc @rust-lang/wg-mir-opt @RalfJung

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 12, 2020
@wesleywiser
Copy link
Member

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion

@bors
Copy link
Contributor

bors commented May 12, 2020

⌛ Trying commit 0a785cd with merge b75ab6aef59abf16a83fbec1804dce3a74244824...

wesleywiser
wesleywiser approved these changes May 12, 2020
View reviewed changes
src/test/mir-opt/const_prop/mutable_variable_aggregate_partial_read/rustc.main.ConstProp.diff Outdated
@@ -29,17 +29,26 @@
// + ty: i32
// + val: Value(Scalar(0x00000063))
// mir::Constant
// + span: $DIR/mutable_variable_aggregate_partial_read.rs:6:11: 6:13
- // + span: $DIR/mutable_variable_aggregate_partial_read.rs:6:11: 6:13
+ // + span: $DIR/mutable_variable_aggregate_partial_read.rs:6:5: 6:13
Copy link
Member

Choose a reason for hiding this comment

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

I should pull 060e437b776e238a492372fbb278fdc27fef1128 out of #71911 and get that merged so we can eliminate this kind of noise from the const prop tests.

wesleywiser
wesleywiser reviewed May 12, 2020
View reviewed changes
src/librustc_mir/transform/const_prop.rs
@@ -893,6 +893,11 @@ impl<'mir, 'tcx> MutVisitor<'tcx> for ConstPropagator<'mir, 'tcx> {
// ```
// FIXME: we overzealously erase the entire local, because that's easier to
// implement.
trace!(
"propagation into {:?} failed.
Nuking the entire site from orbit, it's the only way to be sure",
Copy link
Member

Choose a reason for hiding this comment

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

👏

@bors
Copy link
Contributor

bors commented May 12, 2020

☀️ Try build successful - checks-actions, checks-azure
Build commit: b75ab6aef59abf16a83fbec1804dce3a74244824 (b75ab6aef59abf16a83fbec1804dce3a74244824)

@rust-timer
Copy link
Collaborator

Queued b75ab6aef59abf16a83fbec1804dce3a74244824 with parent d903a9d, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking try commit b75ab6aef59abf16a83fbec1804dce3a74244824, comparison URL.

@wesleywiser
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented May 13, 2020

📌 Commit 0a785cd 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 May 13, 2020
@bors
Copy link
Contributor

bors commented May 16, 2020

⌛ Testing commit 0a785cd with merge edfb262856755d7532ca4cb452d5668360e68f9b...

@bors
Copy link
Contributor

bors commented May 16, 2020

💔 Test failed - checks-azure

@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 May 16, 2020
@wesleywiser
Copy link
Member

@oli-obk I took the liberty of pushing a commit to your branch which blesses the new tests again since #72220 landed.

r=me if you're ok with that 🙂

@RalfJung
Copy link
Member

LGTM. @bors r=wesleywiser

@bors
Copy link
Contributor

bors commented May 17, 2020

📌 Commit 27c818b 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 May 17, 2020
@bors
Copy link
Contributor

bors commented May 17, 2020

⌛ Testing commit 27c818b with merge 7faeae0...

@bors
Copy link
Contributor

bors commented May 17, 2020

☀️ Test successful - checks-azure
Approved by: wesleywiser
Pushing 7faeae0 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 17, 2020
@bors bors merged commit 7faeae0 into rust-lang:master May 17, 2020
@oli-obk oli-obk deleted the const_prop_deaggregates branch May 18, 2020 17:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wesleywiser wesleywiser wesleywiser approved these changes

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
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@oli-obk @wesleywiser @rust-timer @bors @RalfJung @rust-highfive