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 5: Convert MarkGCThingAsLive to GCCellPtr; r=jonco

Browse Source 
--HG--
extra : rebase_source : 19fc003cc5c9796963b8bf54213556e1310ab240
This commit is contained in:
Terrence Cole 2014-12-01 15:06:37 -08:00
parent ec620affc8
commit db67b7add4
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
js/public/GCAPI.h
View File

@ -499,6 +499,21 @@ ExposeGCThingToActiveJS(JS::GCCellPtr thing)
JS::UnmarkGrayGCThingRecursively(thing, thing.kind());
}
static MOZ_ALWAYS_INLINE void
MarkGCThingAsLive(JSRuntime *aRt, JS::GCCellPtr thing)
{
JS::shadow::Runtime *rt = JS::shadow::Runtime::asShadowRuntime(aRt);
#ifdef JSGC_GENERATIONAL
/*
* Any object in the nursery will not be freed during any GC running at that time.
*/
if (IsInsideNursery(thing))
return;
#endif
if (IsIncrementalBarrierNeededOnTenuredGCThing(rt, thing))
JS::IncrementalReferenceBarrier(thing, thing.kind());
}
} /* namespace gc */
} /* namespace js */
@ -523,28 +538,13 @@ ExposeScriptToActiveJS(JSScript *script)
}
/*
* If a GC is currently marking, mark the object black.
* If a GC is currently marking, mark the string black.
*/
static MOZ_ALWAYS_INLINE void
MarkGCThingAsLive(JSRuntime *rt_, void *thing, JSGCTraceKind kind)
{
shadow::Runtime *rt = shadow::Runtime::asShadowRuntime(rt_);
#ifdef JSGC_GENERATIONAL
/*
* Any object in the nursery will not be freed during any GC running at that time.
*/
if (js::gc::IsInsideNursery((js::gc::Cell *)thing))
return;
#endif
if (js::gc::IsIncrementalBarrierNeededOnTenuredGCThing(rt, GCCellPtr(thing, kind)))
IncrementalReferenceBarrier(thing, kind);
}
static MOZ_ALWAYS_INLINE void
MarkStringAsLive(Zone *zone, JSString *string)
{
JSRuntime *rt = JS::shadow::Zone::asShadowZone(zone)->runtimeFromMainThread();
MarkGCThingAsLive(rt, string, JSTRACE_STRING);
js::gc::MarkGCThingAsLive(rt, GCCellPtr(string));
}
/*