Backed out changeset 70bc18f7b6d5 (bug 1006695) for spidermonkey test failures
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Tue, 20 May 2014 10:29:38 +0200
changeset 183848 3111b47cef975b3d286a1b2cf13abde7b1ba8d56
parent 183847 bcf7062a8d7808987b61b117ddcf97ba58f701b8
child 183849 79d5411c1390a509014ce4f4a13ad0938cbba53c
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
bugs1006695
milestone32.0a1
backs out70bc18f7b6d5188fa286c575d2bfd0b2aedc2991
Backed out changeset 70bc18f7b6d5 (bug 1006695) for spidermonkey test failures
js/src/jsworkers.cpp
--- a/js/src/jsworkers.cpp
+++ b/js/src/jsworkers.cpp
@@ -18,20 +18,16 @@
 #include "vm/Debugger.h"
 #include "vm/TraceLogging.h"
 
 #include "jscntxtinlines.h"
 #include "jscompartmentinlines.h"
 #include "jsobjinlines.h"
 #include "jsscriptinlines.h"
 
-#ifdef MOZ_NUWA_PROCESS
-# include "ipc/Nuwa.h"
-#endif
-
 using namespace js;
 
 using mozilla::ArrayLength;
 using mozilla::DebugOnly;
 
 namespace js {
 
 GlobalWorkerThreadState gWorkerThreadState;
@@ -723,24 +719,16 @@ WorkerThread::destroy()
         threadData.destroy();
 }
 
 /* static */
 void
 WorkerThread::ThreadMain(void *arg)
 {
     PR_SetCurrentThreadName("Analysis Helper");
-
-#ifdef MOZ_NUWA_PROCESS
-    if (IsNuwaProcess()) {
-        JS_ASSERT(NuwaMarkCurrentThread != nullptr);
-        NuwaMarkCurrentThread(nullptr, nullptr);
-    }
-#endif
-
     static_cast<WorkerThread *>(arg)->threadLoop();
 }
 
 void
 WorkerThread::handleAsmJSWorkload()
 {
 #ifdef JS_ION
     JS_ASSERT(WorkerThreadState().isLocked());