Bug 875125 - Construct worker thread's PerThreadData before spawning actual thread on a CLOSED TREE

js/src/jsworkers.cpp

@@ -311,6 +311,8 @@ WorkerThreadState::init(JSRuntime *rt)
     for (size_t i = 0; i < numThreads; i++) {
         WorkerThread &helper = threads[i];
         helper.runtime = rt;
+        helper.threadData.construct(rt);
+        helper.threadData.ref().addToThreadList();
         helper.thread = PR_CreateThread(PR_USER_THREAD,
                                         WorkerThread::ThreadMain, &helper,
                                         PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, PR_JOINABLE_THREAD, 0);
@@ -322,8 +324,6 @@ WorkerThreadState::init(JSRuntime *rt)
             numThreads = 0;
             return false;
         }
-        helper.threadData.construct(rt);
-        helper.threadData.ref().addToThreadList();
     }
 
     resetAsmJSFailureState();
@@ -439,19 +439,20 @@ WorkerThread::destroy()
 {
     WorkerThreadState &state = *runtime->workerThreadState;
 
-    if (!thread)
+    if (thread) {
-        return;
+        {
+            AutoLockWorkerThreadState lock(runtime);
+            terminate = true;
 
-    {
+            /* Notify all workers, to ensure that this thread wakes up. */
-        AutoLockWorkerThreadState lock(runtime);
+            state.notifyAll(WorkerThreadState::WORKER);
-        terminate = true;
+        }
 
-        /* Notify all workers, to ensure that this thread wakes up. */
+        PR_JoinThread(thread);
-        state.notifyAll(WorkerThreadState::WORKER);
     }
 
-    PR_JoinThread(thread);
+    if (!threadData.empty())
-    threadData.ref().removeFromThreadList();
+        threadData.ref().removeFromThreadList();
 }
 
 /* static */