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 803019 - Fix case where atoms compartment is only compartment marked in a GC (r=jonco)

Browse Source
This commit is contained in:
Bill McCloskey 2012-12-03 11:10:29 -08:00
parent 7d39705bee
commit a367da58d4
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
js/src/jsgc.cpp
View File

@ -2540,7 +2540,7 @@ CheckForCompartmentMismatches(JSRuntime *rt)
}
#endif
static void
static bool
BeginMarkPhase(JSRuntime *rt)
{
int64_t currentTime = PRMJ_Now();
@ -2550,7 +2550,7 @@ BeginMarkPhase(JSRuntime *rt)
#endif
rt->gcIsFull = true;
DebugOnly<bool> any = false;
bool any = false;
for (CompartmentsIter c(rt); !c.done(); c.next()) {
/* Assert that compartment state is as we expect */
JS_ASSERT(!c->isCollecting());
@ -2560,9 +2560,10 @@ BeginMarkPhase(JSRuntime *rt)
/* Set up which compartments will be collected. */
if (c->isGCScheduled()) {
any = true;
if (c != rt->atomsCompartment)
if (c != rt->atomsCompartment) {
any = true;
c->setGCState(JSCompartment::Mark);
}
} else {
rt->gcIsFull = false;
}
@ -2574,7 +2575,8 @@ BeginMarkPhase(JSRuntime *rt)
}
/* Check that at least one compartment is scheduled for collection. */
JS_ASSERT(any);
if (!any)
return false;
/*
* Atoms are not in the cross-compartment map. So if there are any
@ -2698,6 +2700,8 @@ BeginMarkPhase(JSRuntime *rt)
c->scheduledForDestruction = true;
}
rt->gcFoundBlackGrayEdges = false;
return true;
}
void
@ -3815,7 +3819,11 @@ IncrementalCollectSlice(JSRuntime *rt,
switch (rt->gcIncrementalState) {
case MARK_ROOTS:
BeginMarkPhase(rt);
if (!BeginMarkPhase(rt)) {
rt->gcIncrementalState = NO_INCREMENTAL;
return;
}
if (rt->hasContexts())
PushZealSelectedObjects(rt);

4
js/xpconnect/src/XPCJSRuntime.cpp
View File

@ -748,7 +748,6 @@ XPCJSRuntime::GCCallback(JSRuntime *rt, JSGCStatus status)
}
}
}
self->GetXPConnect()->ClearGCBeforeCC();
break;
}
}
@ -819,6 +818,9 @@ XPCJSRuntime::FinalizeCallback(JSFreeOp *fop, JSFinalizeStatus status, JSBool is
}
case JSFINALIZE_COLLECTION_END:
{
if (!isCompartmentGC)
self->GetXPConnect()->ClearGCBeforeCC();
// mThreadRunningGC indicates that GC is running
{ // scoped lock
XPCAutoLock lock(self->GetMapLock());