diff options
| author | bors <bors@rust-lang.org> | 2025-02-21 11:43:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-02-21 11:43:00 +0000 |
| commit | 9f48dedc9763334a587c66558974635807a113ed (patch) | |
| tree | d0c6785372c7745cfc960d5deb0200aa89b3432b /library/std/src/sys | |
| parent | a18bd8acfc32dbfbbe150cd52eecf24e67fb69b6 (diff) | |
| parent | 40ecda6a33bdfb4ca66ecb5555473511a9b1b9f6 (diff) | |
Auto merge of #137192 - kornelski:windows-tls-lto, r=ChrisDenton
Remove obsolete Windows ThinLTO+TLS workaround The bug #109797 has been fixed by #129079, so this workaround is no longer needed.
Diffstat (limited to 'library/std/src/sys')
| -rw-r--r-- | library/std/src/sys/thread_local/os.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/library/std/src/sys/thread_local/os.rs b/library/std/src/sys/thread_local/os.rs index 00d2e30bd60..fe6af27db3a 100644 --- a/library/std/src/sys/thread_local/os.rs +++ b/library/std/src/sys/thread_local/os.rs @@ -28,9 +28,7 @@ pub macro thread_local_inner { // user provided type or type alias with a matching name. Please update the shadowing test // in `tests/thread.rs` if these types are renamed. unsafe { - // Inlining does not work on windows-gnu due to linking errors around - // dllimports. See https://github.com/rust-lang/rust/issues/109797. - $crate::thread::LocalKey::new(#[cfg_attr(windows, inline(never))] |init| { + $crate::thread::LocalKey::new(|init| { static VAL: $crate::thread::local_impl::Storage<$t> = $crate::thread::local_impl::Storage::new(); VAL.get(init, __init) |