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

bug 674251 - making JSScript a GC-thing. r=jorendorff,bhackett1024

Browse Source
This commit is contained in:
Igor Bukanov
2011-08-09 10:51:59 +02:00
parent ccf7ca6b18
commit f687e50505
48 changed files with 1105 additions and 1090 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
js/src/jsatom.cpp
View File

@@ -645,19 +645,16 @@ js_DumpAtoms(JSContext *cx, FILE *fp)
JS_STATIC_ASSERT(TEMP_SIZE_START >= sizeof(JSHashTable));
void
js_InitAtomMap(JSContext *cx, JSAtomMap *map, AtomIndexMap *indices)
js_InitAtomMap(JSContext *cx, AtomIndexMap *indices, JSAtom **atoms)
{
/* Map length must already be initialized. */
JS_ASSERT(indices->count() == map->length);
if (indices->isMap()) {
typedef AtomIndexMap::WordMap WordMap;
const WordMap &wm = indices->asMap();
for (WordMap::Range r = wm.all(); !r.empty(); r.popFront()) {
JSAtom *atom = r.front().key;
jsatomid index = r.front().value;
JS_ASSERT(index < map->length);
map->vector[index] = atom;
JS_ASSERT(index < indices->count());
atoms[index] = atom;
}
} else {
for (const AtomIndexMap::InlineElem *it = indices->asInline(), *end = indices->inlineEnd();
@@ -665,8 +662,8 @@ js_InitAtomMap(JSContext *cx, JSAtomMap *map, AtomIndexMap *indices)
JSAtom *atom = it->key;
if (!atom)
continue;
JS_ASSERT(it->value < map->length);
map->vector[it->value] = atom;
JS_ASSERT(it->value < indices->count());
atoms[it->value] = atom;
}
}
}