---

yaml
---
r: 349458
b: refs/heads/master-next
c: f2c980c
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: 61ec1fb4a6ef89b62c107fd5292c291ad51b2c8b
+refs/heads/master-next: f2c980c9093d3fa0a040ca8f45a23a346c6b8fb5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/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));