Break out of the correct number of scopes in loops #62388
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We were incorrectly breaking out of one too many drop scopes when generating MIR for loops and breakable blocks, resulting in use after free and associated borrow checker warnings. This wasn't noticed because the scope that we're breaking out of twice is only used for temporaries that are created for adjustments applied to the loop. Since loops generally propagate coercions to the `break` expressions, the only case we see this is when the type of the loop is a smart pointer to a trait object.
|
(rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
I know very little about MIR. |
eddyb
approved these changes
Jul 5, 2019
|
📌 Commit 1b7ffe5 has been approved by |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
Jul 5, 2019
…tion, r=eddyb Break out of the correct number of scopes in loops We were incorrectly breaking out of one too many drop scopes when generating MIR for loops and breakable blocks, resulting in use after free and associated borrow checker warnings. This wasn't noticed because the scope that we're breaking out of twice is only used for temporaries that are created for adjustments applied to the loop. Since loops generally propagate coercions to the `break` expressions, the only case we see this is when the type of the loop is a smart pointer to a trait object. Closes rust-lang#62312
bors
added a commit
that referenced
this pull request
Jul 5, 2019
Rollup of 10 pull requests Successful merges: - #62123 ( Remove needless lifetimes (std)) - #62150 (Implement mem::{zeroed,uninitialized} in terms of MaybeUninit.) - #62169 (Derive which queries to save using the proc macro) - #62238 (Fix code block information icon position) - #62292 (Move `async || ...` closures into `#![feature(async_closure)]`) - #62323 (Clarify unaligned fields in ptr::{read,write}_unaligned) - #62324 (Reduce reliance on `await!(...)` macro) - #62371 (Add tracking issue for Box::into_pin) - #62383 (Improve error span for async type inference error) - #62388 (Break out of the correct number of scopes in loops) Failed merges: r? @ghost
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We were incorrectly breaking out of one too many drop scopes when
generating MIR for loops and breakable blocks, resulting in use after
free and associated borrow checker warnings.
This wasn't noticed because the scope that we're breaking out of twice
is only used for temporaries that are created for adjustments applied to
the loop. Since loops generally propagate coercions to the
breakexpressions, the only case we see this is when the type of the loop is a
smart pointer to a trait object.
Closes #62312