Rollup merge of #94236 - reez12g:add_track_caller_87707, r=yaahc

Add #[track_caller] to track callers when initializing poisoned Once

This PR is for this Issue.
https://github.com/rust-lang/rust/issues/87707

With this fix, we expect to be able to track the caller when poisoned Once is initialized.
This commit is contained in:
Matthias Krüger 2022-03-04 17:31:04 +01:00 committed by GitHub
commit 904c6ca95c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 0 deletions

View File

@ -256,6 +256,7 @@ impl Once {
///
/// [poison]: struct.Mutex.html#poisoning
#[stable(feature = "rust1", since = "1.0.0")]
#[track_caller]
pub fn call_once<F>(&self, f: F)
where
F: FnOnce(),
@ -390,6 +391,7 @@ impl Once {
// currently no way to take an `FnOnce` and call it via virtual dispatch
// without some allocation overhead.
#[cold]
#[track_caller]
fn call_inner(&self, ignore_poisoning: bool, init: &mut dyn FnMut(&OnceState)) {
let mut state_and_queue = self.state_and_queue.load(Ordering::Acquire);
loop {

View File

@ -0,0 +1,15 @@
// test for #87707
// edition:2018
// run-fail
// check-run-results
use std::sync::Once;
use std::panic;
fn main() {
let o = Once::new();
let _ = panic::catch_unwind(|| {
o.call_once(|| panic!("Here Once instance is poisoned."));
});
o.call_once(|| {});
}

View File

@ -0,0 +1,3 @@
thread 'main' panicked at 'Here Once instance is poisoned.', $DIR/issue-87707.rs:12:24
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
thread 'main' panicked at 'Once instance has previously been poisoned', $DIR/issue-87707.rs:14:7