Skip to content

borrowck::mir::dataflow: ignore unwind edges of empty drops #41148

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.

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

Merged
merged 1 commit into from
Apr 8, 2017

Conversation

arielb1
Copy link
Contributor

@arielb1 arielb1 commented Apr 7, 2017

This avoids creating drop flags in many unnecessary situations.

Fixes #41110.

r? @nagisa

beta-nominating because regression. However, that is merely a small perf regression and codegen changes are always risky, so we might let this slide for 1.17.

@arielb1 arielb1 added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 7, 2017
@@ -74,6 +76,66 @@ impl<'tcx> MirPass<'tcx> for ElaborateDrops {

impl Pass for ElaborateDrops {}

/// Return the set of basic blocks whose unwind terminators are known
Copy link
Member

@nagisa nagisa Apr 8, 2017

Choose a reason for hiding this comment

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

I find this comment worded somewhat weirdly. What are the “unwind terminators”? Do you mean the branch that comes out from the terminator, maybe?

Copy link
Member

@nagisa nagisa left a comment

Choose a reason for hiding this comment

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

This looks good. The comment seems somewhat weird in how it is worded, but I don’t mind it much.

r=me

This avoids creating drop flags in many unnecessary situations.

Fixes rust-lang#41110.
@arielb1
Copy link
Contributor Author

arielb1 commented Apr 8, 2017

@bors r=nagisa

@bors
Copy link
Collaborator

bors commented Apr 8, 2017

📌 Commit 6979798 has been approved by nagisa

@bors
Copy link
Collaborator

bors commented Apr 8, 2017

⌛ Testing commit 6979798 with merge 666e714...

bors added a commit that referenced this pull request Apr 8, 2017
borrowck::mir::dataflow: ignore unwind edges of empty drops

This avoids creating drop flags in many unnecessary situations.

Fixes #41110.

r? @nagisa

beta-nominating because regression. However, that is merely a small perf regression and codegen changes are always risky, so we might let this slide for 1.17.
@bors
Copy link
Collaborator

bors commented Apr 8, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: nagisa
Pushing 666e714 to master...

@bors bors merged commit 6979798 into rust-lang:master Apr 8, 2017
@nikomatsakis
Copy link
Contributor

Decided it is not worth it to backport.

@nikomatsakis nikomatsakis removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 20, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants