Changeset 20971 in webkit for trunk/JavaScriptCore

Timestamp:

Apr 20, 2007, 1:47:42 AM (18 years ago)

Author:

bdash

Message:

2007-04-20 Mark Rowe <​[email protected]>

Reviewed by Maciej.

Fix bogus optimisation in the generic pthread code path.

• kjs/collector.cpp: (KJS::currentThreadStackBase):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/collector.cpp (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-04-20  Mark Rowe  <[email protected]>
+
+        Reviewed by Maciej.
+
+        Fix bogus optimisation in the generic pthread code path.
+
+        * kjs/collector.cpp:
+        (KJS::currentThreadStackBase):
+
 2007-04-20  Mark Rowe  <[email protected]>
 

trunk/JavaScriptCore/kjs/collector.cpp

@@ -237 +237 @@
 #elif PLATFORM(UNIX)
     static void *stackBase = 0;
+    static size_t stackSize = 0;
     static pthread_t stackThread;
     pthread_t thread = pthread_self();
@@ -249 +250 @@
         pthread_getattr_np(thread, &sattr);
 #endif
-        size_t stackSize;
         int rc = pthread_attr_getstack(&sattr, &stackBase, &stackSize);
         (void)rc; // FIXME: deal with error code somehow?  seems fatal...
         ASSERT(stackBase);
         pthread_attr_destroy(&sattr);
-        return (void*)(size_t(stackBase) + stackSize);
         stackThread = thread;
     }
+    return (void*)(size_t(stackBase) + stackSize);
 #else
 #error Need a way to get the stack base on this platform