bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #128005 - ChrisDenton:msvc-include, r=joboet

Browse source 
Remove _tls_used hack

All the MSVC targets use `target_thread_locals` (see the [base spec](1afc5fd042/compiler/rustc_target/src/spec/base/windows_msvc.rs (L34))) so this hack is no longer needed. The compiler will ensure that thread locals work properly.
This commit is contained in:
Matthias Krüger 2024-07-20 19:29:00 +02:00 • committed by GitHub
commit 8fe93c9bec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 0 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
library/std/src/sys/thread_local/guard/windows.rs
View file

@ -78,19 +78,6 @@ pub fn enable() {
pub static CALLBACK: unsafe extern "system" fn(*mut c_void, u32, *mut c_void) = tls_callback; pub static CALLBACK: unsafe extern "system" fn(*mut c_void, u32, *mut c_void) = tls_callback;
unsafe extern "system" fn tls_callback(_h: *mut c_void, dw_reason: u32, _pv: *mut c_void) { unsafe extern "system" fn tls_callback(_h: *mut c_void, dw_reason: u32, _pv: *mut c_void) {
// See comments above for what this is doing. Note that we don't need this
// trickery on GNU windows, just on MSVC.
#[cfg(all(target_env = "msvc", not(target_thread_local)))]
{
extern "C" {
static _tls_used: u8;
}
unsafe {
ptr::from_ref(&_tls_used).read_volatile();
}
}
if dw_reason == c::DLL_THREAD_DETACH || dw_reason == c::DLL_PROCESS_DETACH { if dw_reason == c::DLL_THREAD_DETACH || dw_reason == c::DLL_PROCESS_DETACH {
#[cfg(target_thread_local)] #[cfg(target_thread_local)]
unsafe { unsafe {