mozilla-central: changeset 60185:042f7e48aae93c254c2b1130adea27c365fda16f

author	Robert Sayre <sayrer@gmail.com>
	Thu, 06 Jan 2011 21:36:24 -0500
changeset 60185	042f7e48aae93c254c2b1130adea27c365fda16f
parent 60183	d56f9c2057ed127ed2f238ffa2b2c43a6d6c714a
child 60187	deed5a4e5eb7bcd0f5a0bbfece484a7f4dd21f2f
push id	17881
push user	cleary@mozilla.com
push date	Fri, 07 Jan 2011 19:57:21 +0000
treeherder	mozilla-central@54576be62860 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
milestone	2.0b9pre
backs out	d56f9c2057ed127ed2f238ffa2b2c43a6d6c714a
first release with	nightly linux32 8f1c39add00f / 4.0b9pre / 20110108030351 / files nightly linux64 8f1c39add00f / 4.0b9pre / 20110108030351 / files nightly mac 8f1c39add00f / 4.0b9pre / 20110108030351 / files nightly win32 8f1c39add00f / 4.0b9pre / 20110108030351 / files nightly win64 6d621e3fc42e / 4.0b10pre / 20110112074539 / files
last release without	nightly linux32 e3b1c75995ac / 4.0b9pre / 20110104030354 / files nightly linux64 e3b1c75995ac / 4.0b9pre / 20110104030354 / files nightly mac e3b1c75995ac / 4.0b9pre / 20110104030354 / files nightly win32 e3b1c75995ac / 4.0b9pre / 20110104030354 / files nightly win64 6d5bec5bfb8d / 4.0b9pre / 20110104045244 / files

--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -1588,18 +1588,17 @@ MarkContext(JSTracer *trc, JSContext *ac
     for (js::AutoGCRooter *gcr = acx->autoGCRooters; gcr; gcr = gcr->down)
         gcr->trace(trc);
 
     if (acx->sharpObjectMap.depth > 0)
         js_TraceSharpMap(trc, &acx->sharpObjectMap);
 
     MarkValue(trc, acx->iterValue, "iterValue");
 
-    if (acx->compartment)
-        acx->compartment->marked = true;
+    acx->compartment->marked = true;
 
 #ifdef JS_TRACER
     TracerState* state = acx->tracerState;
     while (state) {
         if (state->nativeVp)
             MarkValueRange(trc, state->nativeVpLen, state->nativeVp, "nativeVp");
         state = state->prev;
     }