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

Merge MC -> JM

Browse Source
This commit is contained in:
Brian Hackett
2011-11-26 15:03:20 -08:00
parent b2795310ae 1fa0abb260
commit 4229cb1c4b
1070 changed files with 24777 additions and 75628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
js/src/jsweakmap.cpp
View File

@@ -78,6 +78,14 @@ WeakMapBase::sweepAll(JSTracer *tracer)
m->sweep(tracer);
}
void
WeakMapBase::traceAllMappings(WeakMapTracer *tracer)
{
JSRuntime *rt = tracer->context->runtime;
for (WeakMapBase *m = rt->gcWeakMapList; m; m = m->next)
m->traceMappings(tracer);
}
} /* namespace js */
typedef WeakMap<HeapPtr<JSObject>, HeapValue> ObjectValueMap;
@@ -215,7 +223,7 @@ WeakMap_set(JSContext *cx, uintN argc, Value *vp)
ObjectValueMap *map = GetObjectMap(obj);
if (!map) {
map = cx->new_<ObjectValueMap>(cx);
map = cx->new_<ObjectValueMap>(cx, obj);
if (!map->init()) {
cx->delete_(map);
goto out_of_memory;