From 5183c4b1f34e793dccfa0b010322ad874fc0360e Mon Sep 17 00:00:00 2001
From: Peter Van der Beken <peterv@propagandism.org>
Date: Fri, 15 May 2009 14:35:14 +0200
Subject: [PATCH] Backed out changeset 3e3d2d8cc70f (bug 492483 - fixing
 !JS_THREADSAFE build failure.) to try to fix Tshutdown regression.

---
 js/src/jscntxt.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/src/jscntxt.cpp b/js/src/jscntxt.cpp
index 09334ac512e9..caa8c78609d2 100644
--- a/js/src/jscntxt.cpp
+++ b/js/src/jscntxt.cpp
@@ -582,7 +582,6 @@ js_DestroyContext(JSContext *cx, JSDestroyContextMode mode)
     JSContextCallback cxCallback;
     JSBool last;
 
-    rt = cx->runtime;
 #ifdef JS_THREADSAFE
     /*
      * For API compatibility we allow to destroy contexts without a thread in
@@ -592,9 +591,10 @@ js_DestroyContext(JSContext *cx, JSDestroyContextMode mode)
     JS_ASSERT(cx->thread && CURRENT_THREAD_IS_ME(cx->thread));
     if (!cx->thread)
         JS_SetContextThread(cx);
+#endif
+    rt = cx->runtime;
 
     JS_ASSERT_IF(rt->gcRunning, cx->outstandingRequests == 0);
-#endif
 
     if (mode != JSDCM_NEW_FAILED) {
         cxCallback = rt->cxCallback;