From ed3ecf7fce3e6bb2ce939612526bb23ea690e6fe Mon Sep 17 00:00:00 2001 From: "brendan%mozilla.org" Date: Wed, 13 Feb 2008 04:17:50 +0000 Subject: [PATCH] Fix stupidity from patch for 414452 (417144, r=shaver, thanks to vlad for finding). git-svn-id: svn://10.0.0.236/trunk@245545 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/js/src/jsgc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mozilla/js/src/jsgc.c b/mozilla/js/src/jsgc.c index 9f810bd0e8c..716daeddca3 100644 --- a/mozilla/js/src/jsgc.c +++ b/mozilla/js/src/jsgc.c @@ -2600,9 +2600,15 @@ js_GC(JSContext *cx, JSGCInvocationKind gckind) */ if (rt->gcLevel == 1 && !rt->gcPoke) goto done_running; - rt->gcLevel = 1; + rt->gcLevel = 0; rt->gcPoke = JS_FALSE; + rt->gcRunning = JS_FALSE; +#ifdef JS_THREADSAFE + rt->gcThread = NULL; + rt->requestCount += requestDebit; +#endif gckind = GC_LOCK_HELD; + goto restart_at_beginning; }