corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 782315 - GC: Cut out unnecessary work when not collecting atoms r=billm

Browse Source
This commit is contained in:
Jon Coppeard
2012-08-14 11:10:45 +01:00
parent 91e24182ca
commit 2765a80bbe
3 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
js/src/jsatom.cpp
View File

@@ -204,27 +204,19 @@ js::FinishCommonAtoms(JSRuntime *rt)
}
void
js::MarkAtomState(JSTracer *trc, bool markAll)
js::MarkAtomState(JSTracer *trc)
{
JSRuntime *rt = trc->runtime;
JSAtomState *state = &rt->atomState;
if (markAll) {
for (AtomSet::Range r = state->atoms.all(); !r.empty(); r.popFront()) {
JSAtom *tmp = r.front().asPtr();
MarkStringRoot(trc, &tmp, "locked_atom");
JS_ASSERT(tmp == r.front().asPtr());
}
} else {
for (AtomSet::Range r = state->atoms.all(); !r.empty(); r.popFront()) {
AtomStateEntry entry = r.front();
if (!entry.isTagged())
continue;
for (AtomSet::Range r = state->atoms.all(); !r.empty(); r.popFront()) {
AtomStateEntry entry = r.front();
if (!entry.isTagged())
continue;
JSAtom *tmp = entry.asPtr();
MarkStringRoot(trc, &tmp, "interned_atom");
JS_ASSERT(tmp == entry.asPtr());
}
JSAtom *tmp = entry.asPtr();
MarkStringRoot(trc, &tmp, "interned_atom");
JS_ASSERT(tmp == entry.asPtr());
}
}
@@ -243,8 +235,6 @@ js::SweepAtomState(JSRuntime *rt)
if (!isMarked)
e.removeFront();
else
e.rekeyFront(AtomHasher::Lookup(atom), AtomStateEntry(atom, entry.isTagged()));
}
}