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

Bug 743047 - Make the script atoms HeapPointers; r=billm

Browse Source 
These are only initialized and then read from, but we need to barrier the init
so that we will have a remembered set entry for atoms that are in the nursery.
This commit is contained in:
Terrence Cole
2012-04-05 15:54:57 -07:00
parent 088aa8e128
commit 9561bda0d3
6 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
js/src/jsatom.cpp
View File

@@ -502,8 +502,10 @@ js_DumpAtoms(JSContext *cx, FILE *fp)
JS_STATIC_ASSERT(TEMP_SIZE_START >= sizeof(JSHashTable));
namespace js {
void
js_InitAtomMap(JSContext *cx, AtomIndexMap *indices, JSAtom **atoms)
InitAtomMap(JSContext *cx, AtomIndexMap *indices, HeapPtrAtom *atoms)
{
if (indices->isMap()) {
typedef AtomIndexMap::WordMap WordMap;
@@ -512,7 +514,7 @@ js_InitAtomMap(JSContext *cx, AtomIndexMap *indices, JSAtom **atoms)
JSAtom *atom = r.front().key;
jsatomid index = r.front().value;
JS_ASSERT(index < indices->count());
atoms[index] = atom;
atoms[index].init(atom);
}
} else {
for (const AtomIndexMap::InlineElem *it = indices->asInline(), *end = indices->inlineEnd();
@@ -521,13 +523,11 @@ js_InitAtomMap(JSContext *cx, AtomIndexMap *indices, JSAtom **atoms)
if (!atom)
continue;
JS_ASSERT(it->value < indices->count());
atoms[it->value] = atom;
atoms[it->value].init(atom);
}
}
}
namespace js {
bool
IndexToIdSlow(JSContext *cx, uint32_t index, jsid *idp)
{