Skip to content

stdlib: repair the Windows runtime build #19318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 15, 2018
Merged

stdlib: repair the Windows runtime build #19318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions stdlib/public/runtime/ThreadLocalStorage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,19 +88,6 @@ typedef unsigned long __swift_thread_key_t;
static_assert(std::is_same<__swift_thread_key_t, DWORD>::value,
"__swift_thread_key_t is not a DWORD");

# if defined(_M_IX86)
typedef stdcall void (*__swift_thread_key_destructor)(void *)
# else
typedef void (*__swift_thread_key_destructor)(void *)
# endif

static inline
_stdlib_thread_key_create(__swift_thread_key_t * _Nonnull key,
__swift_thread_key_destructor _Nullable destructor) {
*key = FlsAlloc(destroyTLS_CCAdjustmentThunk);
return *key != FLS_OUT_OF_INDEXES;
}

# define SWIFT_THREAD_KEY_CREATE _stdlib_thread_key_create
# define SWIFT_THREAD_GETSPECIFIC FlsGetValue
# define SWIFT_THREAD_SETSPECIFIC(key, value) (FlsSetValue(key, value) == TRUE)
Expand Down
35 changes: 33 additions & 2 deletions stdlib/public/stubs/ThreadLocalStorage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,39 @@

SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_API
void _stdlib_destroyTLS(void *);

SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_API
void *_stdlib_createTLS(void);

#ifndef SWIFT_THREAD_GETSPECIFIC

# if defined(_WIN32) && !defined(__CYGWIN__)

# if defined(_M_IX86)
typedef __stdcall void (*__swift_thread_key_destructor)(void *);
# else
typedef void (*__swift_thread_key_destructor)(void *);
# endif

static void
#if defined(_M_IX86)
__stdcall
#endif
destroyTLS_CCAdjustmentThunk(void *ptr) {
_stdlib_destroyTLS(ptr);
}

static inline int
_stdlib_thread_key_create(__swift_thread_key_t * _Nonnull key,
__swift_thread_key_destructor _Nullable destructor) {
*key = FlsAlloc(destroyTLS_CCAdjustmentThunk);
return *key != FLS_OUT_OF_INDEXES;
}

# endif

#endif

#if SWIFT_TLS_HAS_RESERVED_PTHREAD_SPECIFIC

SWIFT_RUNTIME_STDLIB_INTERNAL
Expand Down Expand Up @@ -52,7 +82,8 @@ SWIFT_RUNTIME_STDLIB_INTERNAL
void *
_swift_stdlib_threadLocalStorageGet(void) {
static swift::OnceToken_t token;
static pthread_key_t key;
static __swift_thread_key_t key;

SWIFT_ONCE_F(token, [](void *) {
int result = SWIFT_THREAD_KEY_CREATE(&key, [](void *pointer) {
_stdlib_destroyTLS(pointer);
Expand All @@ -61,7 +92,7 @@ _swift_stdlib_threadLocalStorageGet(void) {
swift::fatalError(0, "couldn't create pthread key for stdlib TLS: %s\n",
std::strerror(result));
}, nullptr);

void *value = SWIFT_THREAD_GETSPECIFIC(key);
if (!value) {
value = _stdlib_createTLS();
Expand Down