Bug 908696 - GenerationalGC: Disable post barrier verification when disabling GGC r=terrence

This commit is contained in:
Jon Coppeard 2013-08-28 10:07:20 +01:00
parent 86b679f348
commit dbee0b8d85
2 changed files with 3 additions and 3 deletions

View File

@ -123,7 +123,7 @@ class AutoStopVerifyingBarriers
: runtime(rt)
{
restartPreVerifier = !isShutdown && rt->gcVerifyPreData;
restartPostVerifier = !isShutdown && rt->gcVerifyPostData;
restartPostVerifier = !isShutdown && rt->gcVerifyPostData && rt->gcGenerationalEnabled;
if (rt->gcVerifyPreData)
EndVerifyPreBarriers(rt);
if (rt->gcVerifyPostData)

View File

@ -547,13 +547,13 @@ js::Nursery::collect(JSRuntime *rt, JS::gcreason::Reason reason)
if (!isEnabled())
return;
AutoStopVerifyingBarriers av(rt, false);
if (position() == start())
return;
rt->gcHelperThread.waitBackgroundSweepEnd();
AutoStopVerifyingBarriers av(rt, false);
/* Move objects pointed to by roots from the nursery to the major heap. */
MinorCollectionTracer trc(rt, this);
MarkRuntime(&trc);