Skip to content

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

Merged
bors merged 1 commit into
rust-lang:masterfrom
wesleywiser:uninhabited_enum_variants_pass
Nov 10, 2019
Merged

[mir-opt] Implement pass to remove branches on uninhabited variants#65694
bors merged 1 commit into
rust-lang:masterfrom
wesleywiser:uninhabited_enum_variants_pass

Conversation

@wesleywiser

@wesleywiserwesleywiser commented Oct 22, 2019

Copy link
Copy Markdown
Member

Based on discussion here, this is a pass to eliminate dead code that is caused by branching on an enum with uninhabited variants.

r? @oli-obk

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 22, 2019
@wesleywiser

wesleywiser commented Oct 22, 2019

Copy link
Copy Markdown
MemberAuthor

@bors try
@rust-timer queue

@rust-timer

rust-timer commented Oct 22, 2019

Copy link
Copy Markdown
Collaborator

Awaiting bors try build completion

@bors

bors commented Oct 22, 2019

Copy link
Copy Markdown
Collaborator

⌛ Trying commit 9b6965531f0fa200447fa8dcc9e66175c60773fa with merge 04311b4b9a6e180150b8c541c645e47af3f124a0...

Centril
Centril reviewed Oct 22, 2019
View reviewed changes
Comment threadsrc/librustc_mir/transform/uninhabited_enum_branching.rs Outdated
Comment threadsrc/librustc_mir/transform/uninhabited_enum_branching.rs Outdated
Comment threadsrc/librustc_mir/transform/uninhabited_enum_branching.rs Outdated
Comment threadsrc/librustc_mir/transform/uninhabited_enum_branching.rs Outdated
@bors

bors commented Oct 22, 2019

Copy link
Copy Markdown
Collaborator

☀️ Try build successful - checks-azure
Build commit: 04311b4b9a6e180150b8c541c645e47af3f124a0 (04311b4b9a6e180150b8c541c645e47af3f124a0)

@rust-timer

rust-timer commented Oct 22, 2019

Copy link
Copy Markdown
Collaborator

Queued 04311b4b9a6e180150b8c541c645e47af3f124a0 with parent 50ffa79, future comparison URL.

@rust-timer

rust-timer commented Oct 22, 2019

Copy link
Copy Markdown
Collaborator

Finished benchmarking try commit 04311b4b9a6e180150b8c541c645e47af3f124a0, comparison URL.

@wesleywiser

wesleywiser commented Oct 23, 2019

Copy link
Copy Markdown
MemberAuthor

I think this is about what I was expecting to see. I doubt the benchmarked crates use many enums with uninhabited variants so there isn't much potential for speedup. However, we do see that the pass isn't expensive to run even when it doesn't apply.

I will apply @Centril's review feedback and force push.

@wesleywiser
wesleywiserforce-pushed the uninhabited_enum_variants_pass branch from 9b69655 to c4b7336CompareOctober 24, 2019 02:03
@wesleywiser

wesleywiser commented Oct 24, 2019

Copy link
Copy Markdown
MemberAuthor

Fixed & pushed changes

@bors

bors commented Oct 25, 2019

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #65804) made this pull request unmergeable. Please resolve the merge conflicts.

oli-obk
oli-obk reviewed Oct 25, 2019
View reviewed changes
Comment threadsrc/librustc_mir/transform/uninhabited_enum_branching.rs Outdated
Comment threadsrc/librustc_mir/transform/uninhabited_enum_branching.rs Outdated
@wesleywiser
wesleywiserforce-pushed the uninhabited_enum_variants_pass branch 2 times, most recently from 61ed957 to 2c1c8a4CompareOctober 30, 2019 00:36
@wesleywiser

wesleywiser commented Oct 30, 2019

Copy link
Copy Markdown
MemberAuthor

@bors try @rust-timer queue

@rust-timer

rust-timer commented Oct 30, 2019

Copy link
Copy Markdown
Collaborator

Awaiting bors try build completion

@bors

bors commented Oct 30, 2019

Copy link
Copy Markdown
Collaborator

⌛ Trying commit 2c1c8a4 with merge f9d5de7...

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

bors commented Oct 30, 2019

Copy link
Copy Markdown
Collaborator

☀️ Try build successful - checks-azure
Build commit: f9d5de7 (f9d5de79a3218d1730118818c5fae635dcf8e3a7)

@rust-timer

rust-timer commented Oct 30, 2019

Copy link
Copy Markdown
Collaborator

Queued f9d5de7 with parent aa69777, future comparison URL.

@rust-timer

rust-timer commented Oct 30, 2019

Copy link
Copy Markdown
Collaborator

Finished benchmarking try commit f9d5de7, comparison URL.

@joelpalmer

joelpalmer commented Nov 4, 2019

Copy link
Copy Markdown

Ping from Triage: any updates @wesleywiser@oli-obk?

@wesleywiser

wesleywiser commented Nov 4, 2019

Copy link
Copy Markdown
MemberAuthor

@joelpalmer@oli-obk is on vacation this week so it will probably be next week before they can give a final review.

@wesleywiser
wesleywiserforce-pushed the uninhabited_enum_variants_pass branch from 2c1c8a4 to cbe2f60CompareNovember 7, 2019 02:10
oli-obk
oli-obk reviewed Nov 9, 2019
View reviewed changes
Comment threadsrc/librustc_mir/transform/uninhabited_enum_branching.rs
@oli-obk

oli-obk commented Nov 9, 2019

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Nov 9, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit cbe2f60 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 Nov 9, 2019
@bors

bors commented Nov 9, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit cbe2f60 with merge c296b2d...

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
@bors

bors commented Nov 10, 2019

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Nov 10, 2019
@bors
bors merged commit cbe2f60 into rust-lang:masterNov 10, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oli-obkoli-obkoli-obk left review comments
+1 more reviewer
@CentrilCentrilCentril left review comments
Reviewers whose approvals may not affect merge requirements

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

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@wesleywiser@rust-timer@bors@joelpalmer@oli-obk@Centril@rust-highfive