Skip to content

Rebase and fixup #80493: Remove MIR assignments to ZST types - #83118

Merged
bors merged 6 commits into
rust-lang:masterfrom
erikdesjardins:removezst
Mar 15, 2021
Merged

Rebase and fixup #80493: Remove MIR assignments to ZST types#83118
bors merged 6 commits into
rust-lang:masterfrom
erikdesjardins:removezst

Conversation

@erikdesjardins

@erikdesjardinserikdesjardins commented Mar 14, 2021

Copy link
Copy Markdown
Contributor

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 14, 2021
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@tmiasko

tmiasko commented Mar 14, 2021

Copy link
Copy Markdown
Contributor

@bors try @rust-timer queue

@rust-timer

rust-timer commented Mar 14, 2021

Copy link
Copy Markdown
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rustbotrustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Mar 14, 2021
@bors

bors commented Mar 14, 2021

Copy link
Copy Markdown
Collaborator

⌛ Trying commit 0f9af60 with merge 9bc206fe890926c6eeb208fec47dc5bc8e1dfe78...

@tmiasko

tmiasko commented Mar 14, 2021

Copy link
Copy Markdown
Contributor

@bors try @rust-timer queue

@rust-timer

rust-timer commented Mar 14, 2021

Copy link
Copy Markdown
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@bors

bors commented Mar 14, 2021

Copy link
Copy Markdown
Collaborator

⌛ Trying commit 1b7b33e with merge 7f64e46687647913b6bfebdd755372360087954c...

@erikdesjardins

erikdesjardins commented Mar 14, 2021

Copy link
Copy Markdown
ContributorAuthor

Hmm, does pushing mess up the try build? I thought it would be fine as long as I didn't force-push

@bors

bors commented Mar 14, 2021

Copy link
Copy Markdown
Collaborator

☀️ Try build successful - checks-actions
Build commit: 7f64e46687647913b6bfebdd755372360087954c (7f64e46687647913b6bfebdd755372360087954c)

@rust-timer

rust-timer commented Mar 14, 2021

Copy link
Copy Markdown
Collaborator

Queued 7f64e46687647913b6bfebdd755372360087954c with parent 9320b12, future comparison URL.

tmiasko
tmiasko reviewed Mar 14, 2021
View reviewed changes
Comment threadcompiler/rustc_mir/src/transform/simplify.rs Outdated
@rust-timer

rust-timer commented Mar 15, 2021

Copy link
Copy Markdown
Collaborator

Finished benchmarking try commit (7f64e46687647913b6bfebdd755372360087954c): comparison url.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. Please note that if the perf results are neutral, you should likely undo the rollup=never given below by specifying rollup- to bors.

Importantly, though, if the results of this run are non-neutral do not roll this PR up -- it will mask other regressions or improvements in the roll up.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf

@rustbotrustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Mar 15, 2021
@erikdesjardins
remove unnecessary condition
47f8bac
`_local` isn't visited in `_local = <rhs>` statements in the situation
we care about
@oli-obk

oli-obk commented Mar 15, 2021

Copy link
Copy Markdown
Contributor

@bors r+

Thanks for reviving that PR!

@bors

bors commented Mar 15, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 47f8bac has been approved by oli-obk

@borsbors 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 Mar 15, 2021
@bors

bors commented Mar 15, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 47f8bac with merge 7a7bbdb...

@bors

bors commented Mar 15, 2021

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 7a7bbdb to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Mar 15, 2021
@bors
bors merged commit 7a7bbdb into rust-lang:masterMar 15, 2021
@rustbotrustbot added this to the 1.52.0 milestone Mar 15, 2021
@erikdesjardins
erikdesjardins deleted the removezst branch March 15, 2021 17:13
@tmiasko

tmiasko commented Mar 15, 2021

Copy link
Copy Markdown
Contributor

That landed fast. I will just note that it might be interesting to explore removal of individual ZST assignments still, rather than locals, since this miss the opportunities that exists around code that is using ? with ZST types (? introduces var debug info and const propagation doesn't propagate into call terminators by default, so locals involved remain because they are used).

@erikdesjardins

erikdesjardins commented Mar 16, 2021

Copy link
Copy Markdown
ContributorAuthor

That's what #80493 originally did before #80493 (comment): see https://github.com/rust-lang/rust/compare/22f94499cc9c397420c4cf8ba0bbcabf4018bae7

I'll open a PR.

@erikdesjardinserikdesjardins mentioned this pull request Mar 16, 2021
Merged
bors pushed a commit to rust-lang-ci/rust that referenced this pull request Mar 16, 2021
@erikdesjardins
revert changes fromrust-lang#83118to mark zst return place as unused
affb081
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 23, 2021
@bors
Auto merge ofrust-lang#83177- erikdesjardins:zstassign, r=oli-obk
79e5814
Remove assignments to ZST places instead of marking ZST return place as unused
partially reverts rust-lang#83118
requested by `@tmiasko` in rust-lang#83118 (comment)
r? `@oli-obk`
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tmiaskotmiaskotmiasko left review comments

Assignees

@oli-obkoli-obk

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

1.52.0

Development

Successfully merging this pull request may close these issues.

9 participants

@erikdesjardins@rust-log-analyzer@tmiasko@rust-timer@bors@oli-obk@rust-highfive@rustbot@simonvandel