Skip to content

Commit 334513b

Browse files
committed
Auto merge of #137192 - kornelski:windows-tls-lto, r=<try>
Remove obsolete Windows ThinLTO+TLS workaround The bug #109797 has been fixed by #129079, so this workaround is no longer needed. try-job: x86_64-msvc-1 try-job: x86_64-msvc-2 try-job: i686-msvc-1 try-job: i686-msvc-2 try-job: x86_64-msvc-ext1 try-job: x86_64-msvc-ext2 try-job: x86_64-msvc-ext3 try-job: dist-x86_64-msvc try-job: dist-i686-msvc try-job: dist-aarch64-msvc
2 parents aaa8614 + 40ecda6 commit 334513b

File tree

1 file changed

+1
-3
lines changed
  • library/std/src/sys/thread_local

1 file changed

+1
-3
lines changed

library/std/src/sys/thread_local/os.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ pub macro thread_local_inner {
2828
// user provided type or type alias with a matching name. Please update the shadowing test
2929
// in `tests/thread.rs` if these types are renamed.
3030
unsafe {
31-
// Inlining does not work on windows-gnu due to linking errors around
32-
// dllimports. See https://github.com./rust-lang/rust/issues/109797.
33-
$crate::thread::LocalKey::new(#[cfg_attr(windows, inline(never))] |init| {
31+
$crate::thread::LocalKey::new(|init| {
3432
static VAL: $crate::thread::local_impl::Storage<$t>
3533
= $crate::thread::local_impl::Storage::new();
3634
VAL.get(init, __init)

0 commit comments

Comments
 (0)