Skip to content

std: Switch implementations of thread_local! for WASI #159733

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

Open
alexcrichton wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −6
Open

std: Switch implementations of thread_local! for WASI #159733

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
13 changes: 7 additions & 6 deletions library/std/src/sys/thread_local/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

cfg_select! {
any(
all(target_family = "wasm", not(target_feature = "atomics")),
all(target_family = "wasm", not(target_feature = "atomics"), not(target_os = "wasi")),
target_os = "uefi",
target_os = "zkvm",
target_os = "trusty",
Expand Down Expand Up @@ -54,7 +54,10 @@ cfg_select! {
/// destructor for each variable. On these platforms, we keep track of the
/// destructors ourselves and register (through the [`guard`] module) only a
/// single callback that runs all of the destructors in the list.
#[cfg(all(target_thread_local, not(all(target_family = "wasm", not(target_feature = "atomics")))))]
#[cfg(all(
target_thread_local,
not(all(target_family = "wasm", not(target_feature = "atomics"), not(target_os = "wasi")))
))]
pub(crate) mod destructors {
cfg_select! {
any(
Expand Down Expand Up @@ -93,9 +96,7 @@ pub(crate) mod guard {
pub(crate) use windows::enable;
}
any(
all(target_family = "wasm", not(
all(target_os = "wasi", target_env = "p1", target_feature = "atomics")
)),
all(target_family = "wasm", not(target_os = "wasi")),
target_os = "uefi",
target_os = "zkvm",
target_os = "trusty",
Expand Down Expand Up @@ -150,7 +151,7 @@ pub(crate) mod key {
),
all(not(target_thread_local), target_vendor = "apple"),
target_os = "teeos",
all(target_os = "wasi", target_env = "p1", target_feature = "atomics"),
target_os = "wasi",
) => {
mod racy;
mod unix;
Expand Down
Loading