Skip to content

Outline panicking code for LocalKey::with #135224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 21, 2025
Merged

Outline panicking code for LocalKey::with #135224

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions library/std/src/thread/local.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,14 @@ impl fmt::Display for AccessError {
#[stable(feature = "thread_local_try_with", since = "1.26.0")]
impl Error for AccessError {}

// This ensures the panicking code is outlined from `with` for `LocalKey`.
#[cfg_attr(not(feature = "panic_immediate_abort"), inline(never))]
#[track_caller]
#[cold]
fn panic_access_error(err: AccessError) -> ! {
panic!("cannot access a Thread Local Storage value during or after destruction: {err:?}")
}

impl<T: 'static> LocalKey<T> {
#[doc(hidden)]
#[unstable(
Expand Down Expand Up @@ -269,10 +277,10 @@ impl<T: 'static> LocalKey<T> {
where
F: FnOnce(&T) -> R,
{
self.try_with(f).expect(
"cannot access a Thread Local Storage value \
during or after destruction",
)
match self.try_with(f) {
Ok(r) => r,
Err(err) => panic_access_error(err),
}
}

/// Acquires a reference to the value in this TLS key.
Expand Down Expand Up @@ -327,10 +335,10 @@ impl<T: 'static> LocalKey<T> {
let mut init = Some(init);

let reference = unsafe {
(self.inner)(Some(&mut init)).as_ref().expect(
"cannot access a Thread Local Storage value \
during or after destruction",
)
match (self.inner)(Some(&mut init)).as_ref() {
Some(r) => r,
None => panic_access_error(AccessError),
}
};

f(init, reference)
Expand Down
Loading