Bug 916829 - Ensure Debugger::markAll() really marks all debugger weakmaps r=terrence

js/src/vm/Debugger.cpp

@@ -1526,33 +1526,27 @@ void
 Debugger::markAll(JSTracer *trc)
 {
     JSRuntime *rt = trc->runtime;
-    for (CompartmentsIter c(rt); !c.done(); c.next()) {
+    for (Debugger *dbg = rt->debuggerList.getFirst(); dbg; dbg = dbg->getNext()) {
-        GlobalObjectSet &debuggees = c->getDebuggees();
+        GlobalObjectSet &debuggees = dbg->debuggees;
         for (GlobalObjectSet::Enum e(debuggees); !e.empty(); e.popFront()) {
             GlobalObject *global = e.front();
 
             MarkObjectUnbarriered(trc, &global, "Global Object");
             if (global != e.front())
                 e.rekeyFront(global);
+        }
 
-            const GlobalObject::DebuggerVector *debuggers = global->getDebuggers();
+        HeapPtrObject &dbgobj = dbg->toJSObjectRef();
-            JS_ASSERT(debuggers);
+        MarkObject(trc, &dbgobj, "Debugger Object");
-            for (Debugger * const *p = debuggers->begin(); p != debuggers->end(); p++) {
-                Debugger *dbg = *p;
 
-                HeapPtrObject &dbgobj = dbg->toJSObjectRef();
+        dbg->scripts.trace(trc);
-                MarkObject(trc, &dbgobj, "Debugger Object");
+        dbg->sources.trace(trc);
+        dbg->objects.trace(trc);
+        dbg->environments.trace(trc);
 
-                dbg->scripts.trace(trc);
+        for (Breakpoint *bp = dbg->firstBreakpoint(); bp; bp = bp->nextInDebugger()) {
-                dbg->sources.trace(trc);
+            MarkScriptUnbarriered(trc, &bp->site->script, "breakpoint script");
-                dbg->objects.trace(trc);
+            MarkObject(trc, &bp->getHandlerRef(), "breakpoint handler");
-                dbg->environments.trace(trc);
-
-                for (Breakpoint *bp = dbg->firstBreakpoint(); bp; bp = bp->nextInDebugger()) {
-                    MarkScriptUnbarriered(trc, &bp->site->script, "breakpoint script");
-                    MarkObject(trc, &bp->getHandlerRef(), "breakpoint handler");
-                }
-            }
         }
     }
 }