Bug 1128108 - Do not start post-barrier verification when GGC is disabled; r=jonco

This commit is contained in:
Terrence Cole 2015-02-03 09:12:44 -08:00
parent 8af42d4a1f
commit 0afd57f514
2 changed files with 4 additions and 2 deletions

View File

@ -86,6 +86,8 @@ template <typename T>
void
StoreBuffer::MonoTypeBuffer<T>::mark(StoreBuffer *owner, JSTracer *trc)
{
ReentrancyGuard g(*owner);
MOZ_ASSERT(owner->isEnabled());
MOZ_ASSERT(stores_.initialized());
sinkStores(owner);
for (typename StoreSet::Range r = stores_.all(); !r.empty(); r.popFront())
@ -97,8 +99,8 @@ StoreBuffer::MonoTypeBuffer<T>::mark(StoreBuffer *owner, JSTracer *trc)
void
StoreBuffer::GenericBuffer::mark(StoreBuffer *owner, JSTracer *trc)
{
MOZ_ASSERT(owner->isEnabled());
ReentrancyGuard g(*owner);
MOZ_ASSERT(owner->isEnabled());
if (!storage_)
return;

View File

@ -404,7 +404,7 @@ struct VerifyPostTracer : JSTracer
void
gc::GCRuntime::startVerifyPostBarriers()
{
if (verifyPostData || isIncrementalGCInProgress())
if (!JS::IsGenerationalGCEnabled(rt) || verifyPostData || isIncrementalGCInProgress())
return;
evictNursery();