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

Visit move out of _0 when visiting return #72048

Merged
merged 1 commit into from
May 12, 2020
Merged

Visit move out of _0 when visiting return #72048

merged 1 commit into from
May 12, 2020

Conversation

jonas-schievink
Copy link
Contributor

Closes #72032

@rust-highfive
Copy link
Collaborator

r? @eddyb

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 9, 2020
@jonas-schievink
Copy link
Contributor Author

r? @oli-obk

@rust-highfive rust-highfive assigned oli-obk and unassigned eddyb May 9, 2020
oli-obk
oli-obk reviewed May 11, 2020
View reviewed changes
src/librustc_mir/transform/generator.rs
@@ -91,6 +91,16 @@ impl<'tcx> MutVisitor<'tcx> for RenameLocalVisitor<'tcx> {
*local = self.to;
}
}

fn visit_terminator_kind(&mut self, kind: &mut TerminatorKind<'tcx>, location: Location) {
Copy link
Contributor

Choose a reason for hiding this comment

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

is this change necessary? We should never set self.from to _0, right?

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah nevermind, we do: https://github.com/jonas-schievink/rust/blob/e22cc993fbf9918784ec38a25e04564e7b1973ee/src/librustc_mir/transform/generator.rs#L233

@oli-obk
Copy link
Contributor

oli-obk commented May 11, 2020

@bors r+

@bors
Copy link
Contributor

bors commented May 11, 2020

📌 Commit e22cc99 has been approved by oli-obk

@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 11, 2020
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request May 12, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 12, 2020
@bors
Auto merge of rust-lang#72134 - Dylan-DPC:rollup-h3shfz5, r=Dylan-DPC
d903a9d 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#71737 (Miri: run liballoc tests with threads)
 - rust-lang#71928 (Add strikethrough support to rustdoc)
 - rust-lang#72048 (Visit move out of `_0` when visiting `return`)
 - rust-lang#72096 (Make MIR typeck use `LocalDefId` and fix docs)
 - rust-lang#72128 (strings do not have to be valid UTF-8 any more)

Failed merges:

r? @ghost
@bors bors merged commit 0f95630 into rust-lang:master May 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oli-obk oli-obk oli-obk left review comments

Assignees

@oli-obk oli-obk

Labels
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.

Visiting a MIR return should visit the return place too
5 participants
@jonas-schievink @rust-highfive @oli-obk @bors @eddyb