diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 09:25:14 +0100 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 09:56:31 +0100 |
commit | 6313e1fe4c27755adde87e62db1c2f9fac534ae4 (patch) | |
tree | c57bb29f65e02fbfcc07895a8cc2903fff9300ba /src/3rdparty/v8/src/store-buffer.cc | |
parent | b5a49a260d03249c386f1b63c249089383dd81fa (diff) | |
parent | cac65e7a222b848a735a974b0aeb43209b0cfa18 (diff) |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Change-Id: I892bbc73c276842894a720f761ce31ad1b015672
Diffstat (limited to 'src/3rdparty/v8/src/store-buffer.cc')
-rw-r--r-- | src/3rdparty/v8/src/store-buffer.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/3rdparty/v8/src/store-buffer.cc b/src/3rdparty/v8/src/store-buffer.cc index 3852155..66488ae 100644 --- a/src/3rdparty/v8/src/store-buffer.cc +++ b/src/3rdparty/v8/src/store-buffer.cc @@ -372,7 +372,7 @@ void StoreBuffer::GCPrologue() { } -#ifdef DEBUG +#ifdef VERIFY_HEAP static void DummyScavengePointer(HeapObject** p, HeapObject* o) { // Do nothing. } @@ -415,7 +415,7 @@ void StoreBuffer::VerifyPointers(LargeObjectSpace* space) { void StoreBuffer::Verify() { -#ifdef DEBUG +#ifdef VERIFY_HEAP VerifyPointers(heap_->old_pointer_space(), &StoreBuffer::FindPointersToNewSpaceInRegion); VerifyPointers(heap_->map_space(), @@ -427,9 +427,11 @@ void StoreBuffer::Verify() { void StoreBuffer::GCEpilogue() { during_gc_ = false; +#ifdef VERIFY_HEAP if (FLAG_verify_heap) { Verify(); } +#endif } |