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 1105069 - Part 3: Convert ExposeGCThingToActiveJS to use GCCellPtr; r=jonco

Browse Source 
--HG--
extra : rebase_source : 68fc0a09b046eaf0042337d27bceac1de2b26150
This commit is contained in:
Terrence Cole 2014-05-19 14:58:05 -07:00
parent c6a3264e3c
commit bf54351f2c
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/public/GCAPI.h
View File

@ -479,9 +479,9 @@ namespace js {
namespace gc {
static MOZ_ALWAYS_INLINE void
ExposeGCThingToActiveJS(void *thing, JSGCTraceKind kind)
ExposeGCThingToActiveJS(JS::GCCellPtr thing)
{
MOZ_ASSERT(kind != JSTRACE_SHAPE);
MOZ_ASSERT(thing.kind() != JSTRACE_SHAPE);
JS::shadow::Runtime *rt = GetGCThingRuntime(thing);
#ifdef JSGC_GENERATIONAL
@ -490,13 +490,13 @@ ExposeGCThingToActiveJS(void *thing, JSGCTraceKind kind)
* All live objects in the nursery are moved to tenured at the beginning of
* each GC slice, so the gray marker never sees nursery things.
*/
if (IsInsideNursery((Cell *)thing))
if (IsInsideNursery(thing))
return;
#endif
if (JS::IsIncrementalBarrierNeededOnTenuredGCThing(rt, thing, kind))
JS::IncrementalReferenceBarrier(thing, kind);
if (JS::IsIncrementalBarrierNeededOnTenuredGCThing(rt, thing, thing.kind()))
JS::IncrementalReferenceBarrier(thing, thing.kind());
else if (JS::GCThingIsMarkedGray(thing))
JS::UnmarkGrayGCThingRecursively(thing, kind);
JS::UnmarkGrayGCThingRecursively(thing, thing.kind());
}
} /* namespace gc */
@ -513,13 +513,13 @@ namespace JS {
static MOZ_ALWAYS_INLINE void
ExposeObjectToActiveJS(JSObject *obj)
{
js::gc::ExposeGCThingToActiveJS(obj, JSTRACE_OBJECT);
js::gc::ExposeGCThingToActiveJS(GCCellPtr(obj));
}
static MOZ_ALWAYS_INLINE void
ExposeScriptToActiveJS(JSScript *script)
{
js::gc::ExposeGCThingToActiveJS(script, JSTRACE_SCRIPT);
js::gc::ExposeGCThingToActiveJS(GCCellPtr(script));
}
/*

2
js/public/Value.h
View File

@ -1369,7 +1369,7 @@ static MOZ_ALWAYS_INLINE void
ExposeValueToActiveJS(const Value &v)
{
if (v.isMarkable())
js::gc::ExposeGCThingToActiveJS(v.toGCThing(), v.gcKind());
js::gc::ExposeGCThingToActiveJS(GCCellPtr(v));
}
/************************************************************************/