Rollup merge of #94309 - eholk:issue-57017, r=tmandry
[generator_interior] Be more precise with scopes of borrowed places
Previously the generator interior type checking analysis would use the nearest temporary scope as the scope of a borrowed value. This ends up being overly broad for cases such as:
```rust
fn status(_client_status: &Client) -> i16 {
200
}
fn main() {
let client = Client;
let g = move || match status(&client) {
_status => yield,
};
assert_send(g);
}
```
In this case, the borrow `&client` could be considered in scope for the entirety of the `match` expression, meaning it would be viewed as live across the `yield`, therefore making the generator not `Send`.
In most cases, we want to use the enclosing expression as the scope for a borrowed value which will be less than or equal to the nearest temporary scope. This PR changes the analysis to use the enclosing expression as the scope for most borrows, with the exception of borrowed RValues which are true temporary values that should have the temporary scope. There's one further exception where borrows of a copy such as happens in autoref cases also should be ignored despite being RValues.
Joint work with `@nikomatsakis`
Fixes #57017
r? `@tmandry`
This commit is contained in:
commit
8499a8ba88
6 changed files with 144 additions and 13 deletions
22
src/test/ui/generator/issue-57017.rs
Normal file
22
src/test/ui/generator/issue-57017.rs
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
// check-pass
|
||||
// compile-flags: -Zdrop-tracking
|
||||
#![feature(generators, negative_impls)]
|
||||
|
||||
struct Client;
|
||||
|
||||
impl !Sync for Client {}
|
||||
|
||||
fn status(_client_status: &Client) -> i16 {
|
||||
200
|
||||
}
|
||||
|
||||
fn assert_send<T: Send>(_thing: T) {}
|
||||
|
||||
// This is the same bug as issue 57017, but using yield instead of await
|
||||
fn main() {
|
||||
let client = Client;
|
||||
let g = move || match status(&client) {
|
||||
_status => yield,
|
||||
};
|
||||
assert_send(g);
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue