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/runtime/SwiftTLSContext.cpp
View File

@@ -24,17 +24,17 @@ SwiftTLSContext &SwiftTLSContext::get() {
// If we have reserved keys, use those
SwiftTLSContext *ctx =
static_cast<SwiftTLSContext *>(swift::tls_get(SWIFT_RUNTIME_TLS_KEY));
static_cast<SwiftTLSContext *>(swift::tls_get(swift::tls_key::runtime));
if (ctx)
return *ctx;
static swift::once_t token;
swift::tls_init_once(token, SWIFT_RUNTIME_TLS_KEY, [](void *pointer) {
swift::tls_init_once(token, swift::tls_key::runtime, [](void *pointer) {
delete static_cast<SwiftTLSContext *>(pointer);
});
ctx = new SwiftTLSContext();
swift::tls_set(SWIFT_RUNTIME_TLS_KEY, ctx);
swift::tls_set(swift::tls_key::runtime, ctx);
return *ctx;
#elif defined(SWIFT_THREAD_LOCAL)
@@ -47,7 +47,7 @@ SwiftTLSContext &SwiftTLSContext::get() {
#else
// Otherwise, allocate ourselves a key and use that
static swift::tls_key runtimeKey;
static swift::tls_key_t runtimeKey;
static swift::once_t token;
swift::tls_alloc_once(token, runtimeKey, [](void *pointer) {