-
Notifications
You must be signed in to change notification settings - Fork 12.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #104134 - dtolnay:panictemporaries, r=joshtriplett
Shorten lifetime of panic temporaries in panic_fmt case This fixes an issue called out by `@fasterthanlime` in https://octodon.social/`@fasterthanlime/109304454114856561.` Macros like `todo!("…")` and `panic!("…", …)` drop their `format_args` temporary at the nearest enclosing semicolon **outside** the macro invocation, not inside the macro invocation. Due to the formatting internals being type-erased in a way that is not thread-safe, this blocks futures from being `Send` if there is an `await` anywhere between the panic call and the nearest enclosing semicolon. **Example:** ```rust #![allow(unreachable_code)] async fn f(_: u8) {} async fn g() { f(todo!("...")).await; } fn require_send(_: impl Send) {} fn main() { require_send(g()); } ``` **Before:** ```console error: future cannot be sent between threads safely --> src/main.rs:15:18 | 15 | require_send(g()); | ^^^ future returned by `g` is not `Send` | = help: the trait `Sync` is not implemented for `core::fmt::Opaque` note: future is not `Send` as this value is used across an await --> src/main.rs:9:20 | 9 | f(todo!("...")).await; | ------------ ^^^^^^ await occurs here, with `$crate::format_args!($($arg)+)` maybe used later | | | has type `ArgumentV1<'_>` which is not `Send` note: `$crate::format_args!($($arg)+)` is later dropped here --> src/main.rs:9:26 | 9 | f(todo!("...")).await; | ^ note: required by a bound in `require_send` --> src/main.rs:12:25 | 12 | fn require_send(_: impl Send) {} | ^^^^ required by this bound in `require_send` ``` **After:** works. Arguably there is a rustc fix that could work here too, instead of a standard library change. Rustc could be taught that the code shown above is fine to compile because the `await` is unreachable and so temporaries before the `await` do not need to get put in the anonymous compiler-generated `Future` struct, regardless of syntactically where they're supposed to be dropped according to the language semantics. I would be open to that, though my recollection is that in the past we have been very hesitant about introducing any smarts into Drop placement. People want the language rules about where temporaries are dropped to be as simplistic and predictable as possible.
- Loading branch information
Showing
5 changed files
with
42 additions
and
25 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
// check-pass | ||
// edition:2021 | ||
|
||
#![allow(unreachable_code)] | ||
|
||
async fn f(_: u8) {} | ||
|
||
async fn g() { | ||
// Todo returns `!`, so the await is never reached, and in particular the | ||
// temporaries inside the formatting machinery are not still alive at the | ||
// await point. | ||
f(todo!("...")).await; | ||
} | ||
|
||
fn require_send(_: impl Send) {} | ||
|
||
fn main() { | ||
require_send(g()); | ||
} |
This file contains 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