Back out 61d58d97747a (bug 721463) on expanded suspicion of GC crashes

This commit is contained in:
Phil Ringnalda
2012-02-09 21:02:19 -08:00
parent 133c857446
commit cea53c0836
13 changed files with 687 additions and 417 deletions

View File

@@ -386,15 +386,16 @@ js_TraceAtomState(JSTracer *trc)
JSAtomState *state = &rt->atomState;
if (rt->gcKeepAtoms) {
for (AtomSet::Range r = state->atoms.all(); !r.empty(); r.popFront())
MarkStringRoot(trc, r.front().asPtr(), "locked_atom");
for (AtomSet::Range r = state->atoms.all(); !r.empty(); r.popFront()) {
MarkRoot(trc, r.front().asPtr(), "locked_atom");
}
} else {
for (AtomSet::Range r = state->atoms.all(); !r.empty(); r.popFront()) {
AtomStateEntry entry = r.front();
if (!entry.isTagged())
continue;
MarkStringRoot(trc, entry.asPtr(), "interned_atom");
MarkRoot(trc, entry.asPtr(), "interned_atom");
}
}
}