Commit 2010fcc5 authored by Jon Coppeard's avatar Jon Coppeard
Browse files

Bug 1768734 - Make sure JS holders are cleared before a shutdown GC. r=mccr8, a=RyanVM

Differential Revision: https://phabricator.services.mozilla.com/D147074
parent 5483f0e8
......@@ -972,10 +972,12 @@ void CycleCollectedJSRuntime::TraceGrayJS(JSTracer* aTracer, void* aData) {
// Mark these roots as gray so the CC can walk them later.
JSHolderMap::WhichHolders which = JSHolderMap::HoldersInCollectingZones;
if (JS::AtomsZoneIsCollecting(self->Runtime())) {
// Any holder may point into the atoms zone.
which = JSHolderMap::AllHolders;
// Only trace holders in collecting zones when marking, except if we are
// collecting the atoms zone since any holder may point into that zone.
JSHolderMap::WhichHolders which = JSHolderMap::AllHolders;
if (aTracer->isMarkingTracer() &&
!JS::AtomsZoneIsCollecting(self->Runtime())) {
which = JSHolderMap::HoldersInCollectingZones;
}
self->TraceNativeGrayRoots(aTracer, which);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment