Skip to content

Commit

Permalink
Rollup merge of rust-lang#94309 - eholk:issue-57017, r=tmandry
Browse files Browse the repository at this point in the history
[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 rust-lang#57017

r? `@tmandry`
  • Loading branch information
Dylan-DPC authored Mar 17, 2022
2 parents 5ed4022 + 05008fe commit 59dd179
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 59dd179

Please sign in to comment.