Check mark bit when verifying heap.

runtime/vm/heap.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/heap.h"
 
 #include "platform/assert.h"
 #include "platform/utils.h"
 #include "vm/flags.h"
 #include "vm/isolate.h"
@@ skipping 442 matching lines @@
     uword old_start;
     uword old_end;
     old_space_->StartEndAddress(&old_start, &old_end);
     *start = Utils::Minimum(old_start, *start);
     *end = Utils::Maximum(old_end, *end);
   }
   ASSERT(*start <= *end);
 }
 
 
-ObjectSet* Heap::CreateAllocatedObjectSet() const {
+ObjectSet* Heap::CreateAllocatedObjectSet(
+    MarkExpectation mark_expectation) const {
   uword start = static_cast<uword>(-1);
   uword end = 0;
   Isolate* vm_isolate = Dart::vm_isolate();
   vm_isolate->heap()->GetMergedAddressRange(&start, &end);
   this->GetMergedAddressRange(&start, &end);
 
   ObjectSet* allocated_set = new ObjectSet(start, end);
-
-  VerifyObjectVisitor object_visitor(isolate(), allocated_set);
-  this->IterateObjects(&object_visitor);
-  vm_isolate->heap()->IterateObjects(&object_visitor);
-
+  {
+    VerifyObjectVisitor object_visitor(
+        isolate(), allocated_set, mark_expectation);
+    this->IterateObjects(&object_visitor);
+  }
+  {
+    // VM isolate heap is premarked.
+    VerifyObjectVisitor vm_object_visitor(
+        isolate(), allocated_set, kRequireMarked);
+    vm_isolate->heap()->IterateObjects(&vm_object_visitor);
+  }
   return allocated_set;
 }
 
 
-bool Heap::Verify() const {
-  ObjectSet* allocated_set = CreateAllocatedObjectSet();
+bool Heap::Verify(MarkExpectation mark_expectation) const {
+  ObjectSet* allocated_set = CreateAllocatedObjectSet(mark_expectation);
   VerifyPointersVisitor visitor(isolate(), allocated_set);
   IteratePointers(&visitor);
   delete allocated_set;
   // Only returning a value so that Heap::Validate can be called from an ASSERT.
   return true;
 }
 
 
 void Heap::PrintSizes() const {
   OS::PrintErr("New space (%" Pd "k of %" Pd "k) "
@@ skipping 225 matching lines @@
     heap->DisableGrowthControl();
 }
 
 
 NoHeapGrowthControlScope::~NoHeapGrowthControlScope() {
     Heap* heap = reinterpret_cast<Isolate*>(isolate())->heap();
     heap->SetGrowthControlState(current_growth_controller_state_);
 }
 
 }  // namespace dart