[project @ 2005-10-27 08:00:03 by simonmar]

Fix getThreadLocalVar() on Win32 - thanks for Krasimir for finding the bug.

diff --git a/ghc/rts/win32/OSThreads.c b/ghc/rts/win32/OSThreads.c
index e4cd76b..5559765 100644 (file)
--- a/ghc/rts/win32/OSThreads.c
+++ b/ghc/rts/win32/OSThreads.c
@@ -137,9 +137,13 @@ getThreadLocalVar (ThreadLocalKey *key)
 {
     void *r;
     r = TlsGetValue(*key);
-    if (r == NULL) {
+#ifdef DEBUG
+    // r is allowed to be NULL - it can mean that either there was an
+    // error or the stored value is in fact NULL.
+    if (GetLastError() != NO_ERROR) {
        barf("getThreadLocalVar: key not found");
     }
+#endif
     return r;
 }