Skip to content

Commit

Permalink
Rollup merge of rust-lang#94236 - reez12g:add_track_caller_87707, r=y…
Browse files Browse the repository at this point in the history
…aahc

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

This PR is for this Issue.
rust-lang#87707

With this fix, we expect to be able to track the caller when poisoned Once is initialized.
  • Loading branch information
matthiaskrgr authored Mar 4, 2022
2 parents b4bf56c + bca67fe commit 904c6ca
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 0 deletions.
2 changes: 2 additions & 0 deletions library/std/src/sync/once.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down Expand Up @@ -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 {
Expand Down
15 changes: 15 additions & 0 deletions src/test/ui/issues/issue-87707.rs
Original file line number Diff line number Diff line change
@@ -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(|| {});
}
3 changes: 3 additions & 0 deletions src/test/ui/issues/issue-87707.run.stderr
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 904c6ca

Please sign in to comment.