Bug 790338 - Sweep compartments in groups r=billm

2012-11-16 15:34:22 +00:00
parent b9737ba710
commit 6f764b0d32
15 changed files with 466 additions and 393 deletions
--- a/js/src/jsatom.cpp
+++ b/js/src/jsatom.cpp
@@ -205,12 +205,12 @@ js::SweepAtoms(JSRuntime *rt)
    for (AtomSet::Enum e(rt->atoms); !e.empty(); e.popFront()) {
        AtomStateEntry entry = e.front();
        JSAtom *atom = entry.asPtr();
-        bool isMarked = IsStringMarked(&atom);
+        bool isDying = IsStringAboutToBeFinalized(&atom);

        /* Pinned or interned key cannot be finalized. */
-        JS_ASSERT_IF(entry.isTagged(), isMarked);
+        JS_ASSERT_IF(entry.isTagged(), !isDying);

-        if (!isMarked)
+        if (isDying)
            e.removeFront();
    }
 }