Skip to content

Return early if generator_drop.is_some() #5239

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Closed
wants to merge 2 commits into from

Conversation

JohnTitor
Copy link
Member

@JohnTitor JohnTitor commented Feb 28, 2020

It can be an avoidance for the clippy ICEs caused by rust-lang/rust#68528 but I'm not sure it's an actual fix.

changelog: Fix ICE in redundant_clone

@JohnTitor
Copy link
Member Author

r? @oli-obk

@matthiaskrgr
Copy link
Member

Could you add this as a test please? #5238 (comment)

@JohnTitor
Copy link
Member Author

Sure, added.

@matthiaskrgr
Copy link
Member

r? @sinkuu

@JohnTitor JohnTitor added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Feb 28, 2020
@JohnTitor
Copy link
Member Author

Proper fix is submitted: rust-lang/rust#69562
So I'm going to close this in favor of that, thanks @ecstatic-morse!

@JohnTitor JohnTitor closed this Feb 28, 2020
@JohnTitor JohnTitor deleted the dataflow branch February 28, 2020 20:19
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Mar 1, 2020
…iscriminant, r=oli-obk

Don't `bug` when taking discriminant of generator during dataflow

The proper fix for rust-lang/rust-clippy#5239. `Rvalue::Discriminant` is used on generators as well as `enum`s. This didn't cause a test failure in `rustc` since we don't need to do any dataflow passes until after the generator transform that adds the `Rvalue::Discriminant`.

This required a small refactoring. `diff -w` is beneficial.

r? @oli-obk
cc @JohnTitor
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants