Fix DEBUG_CC bustage treating all XPConnect roots as expected garbage. b=410116 r+sr=peterv Not part of default build (DEBUG_CC-only).

This commit is contained in:
dbaron@dbaron.org 2008-01-11 14:24:04 -08:00
parent c2bd6ac6c5
commit 79ec4ed625

View File

@ -2385,7 +2385,6 @@ nsCycleCollector::ExplainLiveExpectedGarbage()
{
// Instead of filling mBuf from the purple buffer, we fill it
// from the list of nodes we were expected to collect.
PRUint32 suspectCurrentCount = mBuf.GetSize();
mExpectedGarbage.EnumerateEntries(&AddExpectedGarbage, this);
GCGraphBuilder builder(mGraph, mRuntimes);
@ -2395,6 +2394,11 @@ nsCycleCollector::ExplainLiveExpectedGarbage()
mRuntimes[i]->BeginCycleCollection(builder);
}
// This might fail to explain expected garbage that's also in
// the set of roots added by the runtimes (what used to be
// called suspectCurrent), but that seems pretty unlikely.
PRUint32 suspectCurrentCount = builder.Count();
MarkRoots(builder);
ScanRoots();