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

Bug 1149352 - Part 7: Move String marking to TraceEdge; r=jonco

Browse Source
This commit is contained in:
Terrence Cole
2015-03-30 15:14:23 -07:00
parent fb354b3268
commit 09d02cf58b
23 changed files with 58 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/jsatom.cpp
View File

@@ -203,7 +203,7 @@ js::MarkAtoms(JSTracer* trc)
JSAtom* atom = entry.asPtr();
bool tagged = entry.isTagged();
MarkStringRoot(trc, &atom, "interned_atom");
TraceRoot(trc, &atom, "interned_atom");
if (entry.asPtr() != atom)
e.rekeyFront(AtomHasher::Lookup(atom), AtomStateEntry(atom, tagged));
}
@@ -255,7 +255,7 @@ JSRuntime::sweepAtoms()
for (AtomSet::Enum e(*atoms_); !e.empty(); e.popFront()) {
AtomStateEntry entry = e.front();
JSAtom* atom = entry.asPtr();
bool isDying = IsStringAboutToBeFinalized(&atom);
bool isDying = IsAboutToBeFinalizedUnbarriered(&atom);
/* Pinned or interned key cannot be finalized. */
MOZ_ASSERT_IF(hasContexts() && entry.isTagged(), !isDying);