Remove _tls_used trickery unless needed

ChrisDenton · ChrisDenton · commit ad4c4f4654bf · 2024-02-26T11:35:38.000-03:00
diff --git a/library/std/src/sys/pal/windows/thread_local_key.rs b/library/std/src/sys/pal/windows/thread_local_key.rs
@@ -295,16 +295,13 @@ unsafe extern "system" fn on_tls_callback(_h: c::LPVOID, dwReason: c::DWORD, _pv
 
     // See comments above for what this is doing. Note that we don't need this
     // trickery on GNU windows, just on MSVC.
-    reference_tls_used();
-    #[cfg(target_env = "msvc")]
-    unsafe fn reference_tls_used() {
+    #[cfg(all(target_env = "msvc", not(target_thread_local)))]
+    {
         extern "C" {
             static _tls_used: u8;
         }
         crate::intrinsics::volatile_load(&_tls_used);
     }
-    #[cfg(not(target_env = "msvc"))]
-    unsafe fn reference_tls_used() {}
 }
 
 #[cfg(not(target_thread_local))]

Original file line number	Diff line number	Diff line change
`@@ -295,16 +295,13 @@ unsafe extern "system" fn on_tls_callback(_h: c::LPVOID, dwReason: c::DWORD, _pv`
`295`	`295`
`296`	`296`	`// See comments above for what this is doing. Note that we don't need this`
`297`	`297`	`// trickery on GNU windows, just on MSVC.`
`298`		`- reference_tls_used();`
`299`		`- #[cfg(target_env = "msvc")]`
`300`		`- unsafe fn reference_tls_used() {`
	`298`	`+ #[cfg(all(target_env = "msvc", not(target_thread_local)))]`
	`299`	`+ {`
`301`	`300`	`extern "C" {`
`302`	`301`	`static _tls_used: u8;`
`303`	`302`	`}`
`304`	`303`	`crate::intrinsics::volatile_load(&_tls_used);`
`305`	`304`	`}`
`306`		`- #[cfg(not(target_env = "msvc"))]`
`307`		`- unsafe fn reference_tls_used() {}`
`308`	`305`	`}`
`309`	`306`
`310`	`307`	`#[cfg(not(target_thread_local))]`