Bug 1093307 - Part 1: Shrinking GC's already sweep on the foreground so remove the flag; r=jonco

--HG--
extra : rebase_source : 521266ba686047388ddb1832d6a4f83f0bcf3410
This commit is contained in:
Terrence Cole 2014-11-04 10:53:27 -08:00
parent 6037baab42
commit b105928718
2 changed files with 4 additions and 4 deletions

View File

@ -3437,7 +3437,7 @@ BackgroundAllocTask::run()
}
void
GCHelperState::startBackgroundSweep(bool shouldShrink)
GCHelperState::startBackgroundSweep()
{
MOZ_ASSERT(CanUseExtraThreads());
@ -3446,7 +3446,7 @@ GCHelperState::startBackgroundSweep(bool shouldShrink)
MOZ_ASSERT(state() == IDLE);
MOZ_ASSERT(!sweepFlag);
sweepFlag = true;
shrinkFlag = shouldShrink;
shrinkFlag = false;
startBackgroundThread(SWEEPING);
}
@ -5355,7 +5355,7 @@ GCRuntime::endSweepPhase(bool lastGC)
#endif
if (sweepOnBackgroundThread)
helperState.startBackgroundSweep(invocationKind == GC_SHRINK);
helperState.startBackgroundSweep();
}
#ifdef JSGC_COMPACTING

View File

@ -1061,7 +1061,7 @@ class GCHelperState
void work();
/* Must be called with the GC lock taken. */
void startBackgroundSweep(bool shouldShrink);
void startBackgroundSweep();
/* Must be called with the GC lock taken. */
void startBackgroundShrink();