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 1167309 - Remove MaybeCompartment using CallTyped; r=jonco

Browse Source
This commit is contained in:
Terrence Cole 2015-05-21 11:41:18 -07:00
parent 5eb0c891df
commit a2200151d1
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
js/src/jsgc.cpp
View File

@ -3725,20 +3725,9 @@ CheckCompartment(CompartmentCheckTracer* trc, JSCompartment* thingCompartment,
InCrossCompartmentMap((JSObject*)trc->src, thing, kind))); InCrossCompartmentMap((JSObject*)trc->src, thing, kind)));
} }
static JSCompartment* struct MaybeCompartmentFunctor {
CompartmentOfCell(Cell* thing, JSGCTraceKind kind) template <typename T> JSCompartment* operator()(T* t) { return t->maybeCompartment(); }
{ };
if (kind == JSTRACE_OBJECT)
return static_cast<JSObject*>(thing)->compartment();
else if (kind == JSTRACE_SHAPE)
return static_cast<Shape*>(thing)->compartment();
else if (kind == JSTRACE_BASE_SHAPE)
return static_cast<BaseShape*>(thing)->compartment();
else if (kind == JSTRACE_SCRIPT)
return static_cast<JSScript*>(thing)->compartment();
else
return nullptr;
}
static void static void
CheckCompartmentCallback(JS::CallbackTracer* trcArg, void** thingp, JSGCTraceKind kind) CheckCompartmentCallback(JS::CallbackTracer* trcArg, void** thingp, JSGCTraceKind kind)
@ -3746,7 +3735,7 @@ CheckCompartmentCallback(JS::CallbackTracer* trcArg, void** thingp, JSGCTraceKin
CompartmentCheckTracer* trc = static_cast<CompartmentCheckTracer*>(trcArg); CompartmentCheckTracer* trc = static_cast<CompartmentCheckTracer*>(trcArg);
TenuredCell* thing = TenuredCell::fromPointer(*thingp); TenuredCell* thing = TenuredCell::fromPointer(*thingp);
JSCompartment* comp = CompartmentOfCell(thing, kind); JSCompartment* comp = CallTyped(MaybeCompartmentFunctor(), thing, kind);
if (comp && trc->compartment) if (comp && trc->compartment)
CheckCompartment(trc, comp, thing, kind); CheckCompartment(trc, comp, thing, kind);
else else
@ -3766,7 +3755,7 @@ GCRuntime::checkForCompartmentMismatches()
for (ZoneCellIterUnderGC i(zone, thingKind); !i.done(); i.next()) { for (ZoneCellIterUnderGC i(zone, thingKind); !i.done(); i.next()) {
trc.src = i.getCell(); trc.src = i.getCell();
trc.srcKind = MapAllocToTraceKind(thingKind); trc.srcKind = MapAllocToTraceKind(thingKind);
trc.compartment = CompartmentOfCell(trc.src, trc.srcKind); trc.compartment = CallTyped(MaybeCompartmentFunctor(), trc.src, trc.srcKind);
JS_TraceChildren(&trc, trc.src, trc.srcKind); JS_TraceChildren(&trc, trc.src, trc.srcKind);
} }
} }