wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 821340 - Fix non-GC marking of weakmaps (r=mccr8)

Browse Source 
--HG--
extra : rebase_source : e46b57a4619aa26cea067336b92a478c2cb4f6e7
This commit is contained in:
Bill McCloskey 2012-12-18 11:52:37 -08:00
parent 36327a146e
commit 4b56853b88
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
js/src/gc/Marking.cpp
View File

@ -1502,13 +1502,27 @@ UnmarkGrayGCThing(void *thing)
static_cast<js::gc::Cell *>(thing)->unmark(js::gc::GRAY);
}
static void
UnmarkGrayChildren(JSTracer *trc, void **thingp, JSGCTraceKind kind);
struct UnmarkGrayTracer : public JSTracer
{
UnmarkGrayTracer() : tracingShape(false), previousShape(NULL) {}
UnmarkGrayTracer(JSTracer *trc, bool tracingShape)
: tracingShape(tracingShape), previousShape(NULL)
/*
* We set eagerlyTraceWeakMaps to false because the cycle collector will fix
* up any color mismatches involving weakmaps when it runs.
*/
UnmarkGrayTracer(JSRuntime *rt)
: tracingShape(false), previousShape(NULL)
{
JS_TracerInit(this, trc->runtime, trc->callback);
JS_TracerInit(this, rt, UnmarkGrayChildren);
eagerlyTraceWeakMaps = false;
}
UnmarkGrayTracer(JSTracer *trc, bool tracingShape)
: tracingShape(tracingShape), previousShape(NULL)
{
JS_TracerInit(this, trc->runtime, UnmarkGrayChildren);
eagerlyTraceWeakMaps = false;
}
/* True iff we are tracing the immediate children of a shape. */
@ -1593,7 +1607,6 @@ js::UnmarkGrayGCThingRecursively(void *thing, JSGCTraceKind kind)
UnmarkGrayGCThing(thing);
JSRuntime *rt = static_cast<Cell *>(thing)->compartment()->rt;
UnmarkGrayTracer trc;
JS_TracerInit(&trc, rt, UnmarkGrayChildren);
UnmarkGrayTracer trc(rt);
JS_TraceChildren(&trc, thing, kind);
}

2
js/src/jsweakmap.h
View File

@ -143,7 +143,7 @@ class WeakMap : public HashMap<Key, Value, HashPolicy, RuntimeAllocPolicy>, publ
void nonMarkingTrace(JSTracer *trc) {
for (Range r = Base::all(); !r.empty(); r.popFront())
markValue(trc, &r.front().value);
gc::Mark(trc, &r.front().value, "WeakMap entry");
}
bool keyNeedsMark(JSObject *key) {