averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Threading] Don't use TLS keys as template arguments.

Browse Source 
There's no guarantee that e.g. pthread_key_t is an integral type.  It could
be some kind of struct, or some other thing that isn't valid as a template
argument.

rdar://90776105
This commit is contained in:
Alastair Houghton
2022-05-04 11:08:09 +01:00
parent c7c1c1be80
commit eb4c81d60e
13 changed files with 122 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
stdlib/public/stubs/ThreadLocalStorage.cpp
View File

@@ -35,22 +35,22 @@ _swift_stdlib_threadLocalStorageGet(void) {
#elif SWIFT_THREADING_USE_RESERVED_TLS_KEYS
// If we have reserved keys, use those
void *value = swift::tls_get(SWIFT_STDLIB_TLS_KEY);
void *value = swift::tls_get(swift::tls_key::stdlib);
if (value)
return value;
static swift::once_t token;
swift::tls_init_once(token, SWIFT_STDLIB_TLS_KEY,
swift::tls_init_once(token, swift::tls_key::stdlib,
[](void *pointer) { _stdlib_destroyTLS(pointer); });
value = _stdlib_createTLS();
swift::tls_set(SWIFT_STDLIB_TLS_KEY, value);
swift::tls_set(swift::tls_key::stdlib, value);
return value;
#else // Threaded, but not using reserved keys
// Register a key and use it
static swift::tls_key key;
static swift::tls_key_t key;
static swift::once_t token;
swift::tls_alloc_once(token, key,