Backed out changeset 6f0a56999e9b (bug 650161)

2014-09-17 17:33:58 +01:00
parent a4ba2460e2
commit 586ab22d84
9 changed files with 12 additions and 35 deletions
--- a/js/src/jsweakmap.cpp
+++ b/js/src/jsweakmap.cpp
@@ -71,12 +71,8 @@ WeakMapBase::unmarkCompartment(JSCompartment *c)
 void
 WeakMapBase::markAll(JSCompartment *c, JSTracer *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");
-    }
+    for (WeakMapBase *m = c->gcWeakMapList; m; m = m->next)
+        m->markIteratively(tracer);
 }

 bool