Changeset 27294 in webkit for trunk/JavaScriptCore/wtf/FastMalloc.cpp

Timestamp:

Oct 31, 2007, 12:18:46 AM (18 years ago)

Author:

aroben

Message:

Fix Bug 15586: REGRESSION (r26759-r26785): Windows nightly builds crash with Safari 3 Public Beta

​http://bugs.webkit.org/show_bug.cgi?id=15586

Also fixes: <rdar://5565303> Cannot use regsvr32.exe to register WebKit.dll

Use Win32 TLS functions instead of declspec(thread), which breaks
delay-loading.

Reviewed by Steve.

• wtf/FastMalloc.cpp: (WTF::getThreadHeap): (WTF::TCMalloc_ThreadCache::InitModule):

File:

• trunk/JavaScriptCore/wtf/FastMalloc.cpp (modified) (5 diffs)

trunk/JavaScriptCore/wtf/FastMalloc.cpp

@@ -191 +191 @@
 #include <stdio.h>
 #include <string.h>
+#if COMPILER(MSVC)
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif
 
 #if WTF_CHANGES
@@ -1294 +1298 @@
 static pthread_key_t heap_key;
 #if COMPILER(MSVC)
-__declspec(thread) TCMalloc_ThreadCache* threadHeap;
+DWORD tlsIndex = TLS_OUT_OF_INDEXES;
 #endif
 
@@ -1300 +1304 @@
 {
 #if COMPILER(MSVC)
-    return threadHeap;
+    return static_cast<TCMalloc_ThreadCache*>(TlsGetValue(tlsIndex));
 #else
     return static_cast<TCMalloc_ThreadCache*>(pthread_getspecific(heap_key));
@@ -1312 +1316 @@
     pthread_setspecific(heap_key, heap);
 #if COMPILER(MSVC)
-    threadHeap = heap;
+    TlsSetValue(tlsIndex, heap);
 #endif
 }
@@ -1643 +1647 @@
   ASSERT(!tsd_inited);
   pthread_key_create(&heap_key, DeleteCache);
+#if COMPILER(MSVC)
+  tlsIndex = TlsAlloc();
+#endif
   tsd_inited = true;