Merge remote-tracking branch 'origin/master' into master-rebranch

Author: swift-ci

stdlib/public/stubs/ThreadLocalStorage.cpp

@@ -23,14 +23,6 @@ void _stdlib_destroyTLS(void *);
 SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_API
 void *_stdlib_createTLS(void);
 
-#if defined(_WIN32) && !defined(__CYGWIN__)
-
-typedef
-#if defined(_M_IX86)
-__stdcall
-#endif
-void (*__swift_thread_key_destructor)(void *);
-
 static void
 #if defined(_M_IX86)
 __stdcall
@@ -39,6 +31,14 @@ destroyTLS_CCAdjustmentThunk(void *ptr) {
   _stdlib_destroyTLS(ptr);
 }
 
+#if defined(_WIN32) && !defined(__CYGWIN__)
+
+typedef
+#if defined(_M_IX86)
+__stdcall
+#endif
+void (*__swift_thread_key_destructor)(void *);
+
 static inline int
 _stdlib_thread_key_create(__swift_thread_key_t * _Nonnull key,
                           __swift_thread_key_destructor _Nullable destructor) {
@@ -83,9 +83,7 @@ _swift_stdlib_threadLocalStorageGet(void) {
   static __swift_thread_key_t key;
 
   SWIFT_ONCE_F(token, [](void *) {
-    int result = SWIFT_THREAD_KEY_CREATE(&key, [](void *pointer) {
-      _stdlib_destroyTLS(pointer);
-    });
+    int result = SWIFT_THREAD_KEY_CREATE(&key, destroyTLS_CCAdjustmentThunk);
     if (result != 0)
       swift::fatalError(0, "couldn't create pthread key for stdlib TLS: %s\n",
                         std::strerror(result));