Bug 650161 - Fix shell test failures caused by compacting GC r=terrence

2014-09-17 15:35:11 +01:00
parent 935d549a5a
commit b9a220b3aa
9 changed files with 35 additions and 12 deletions
--- a/js/src/jsweakmap.cpp
+++ b/js/src/jsweakmap.cpp
@@ -71,8 +71,12 @@ WeakMapBase::unmarkCompartment(JSCompartment *c)
 void
 WeakMapBase::markAll(JSCompartment *c, JSTracer *tracer)
 {
-    for (WeakMapBase *m = c->gcWeakMapList; m; m = m->next)
-        m->markIteratively(tracer);
+    JS_ASSERT(tracer->eagerlyTraceWeakMaps() != DoNotTraceWeakMaps);
+    for (WeakMapBase *m = c->gcWeakMapList; m; m = m->next) {
+        m->trace(tracer);
+        if (m->memberOf)
+            gc::MarkObject(tracer, &m->memberOf, "memberOf");
+    }
 }

 bool