Implement a 2-pass heap verification algorithm.

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/compiler_stats.h"
 #include "vm/flags.h"
 #include "vm/heap_profiler.h"
 #include "vm/isolate.h"
 #include "vm/object.h"
+#include "vm/object_set.h"
 #include "vm/os.h"
 #include "vm/pages.h"
 #include "vm/scavenger.h"
 #include "vm/stack_frame.h"
 #include "vm/verifier.h"
 #include "vm/virtual_memory.h"
 
 namespace dart {
 
 DEFINE_FLAG(bool, verbose_gc, false, "Enables verbose GC.");
@@ skipping 83 matching lines @@
       old_space_->Contains(addr) ||
       code_space_->Contains(addr);
 }
 
 
 bool Heap::CodeContains(uword addr) const {
   return code_space_->Contains(addr);
 }
 
 
+void Heap::IterateObjects(ObjectVisitor* visitor) {
+  new_space_->VisitObjects(visitor);
+  old_space_->VisitObjects(visitor);
+  code_space_->VisitObjects(visitor);
+}
+
+
+void Heap::IteratePointers(ObjectPointerVisitor* visitor) {
+  new_space_->VisitObjectPointers(visitor);
+  old_space_->VisitObjectPointers(visitor);
+  code_space_->VisitObjectPointers(visitor);
+}
+
+
 void Heap::IterateNewPointers(ObjectPointerVisitor* visitor) {
   new_space_->VisitObjectPointers(visitor);
 }
 
 
 void Heap::IterateOldPointers(ObjectPointerVisitor* visitor) {
   old_space_->VisitObjectPointers(visitor);
   code_space_->VisitObjectPointers(visitor);
 }
 
@@ skipping 84 matching lines @@
 }
 
 
 void Heap::Init(Isolate* isolate) {
   ASSERT(isolate->heap() == NULL);
   Heap* heap = new Heap();
   isolate->set_heap(heap);
 }
 
 
+void Heap::StartEndAddress(uword* start, uword* end) const {
+  ASSERT(new_space_->capacity() != 0);
+  new_space_->StartEndAddress(start, end);
+  if (old_space_->capacity() != 0) {
+    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);
+  }
+  if (code_space_->capacity() != 0) {
+    uword code_start;
+    uword code_end;
+    code_space_->StartEndAddress(&code_start, &code_end);
+    *start = Utils::Minimum(code_start, *start);
+    *end = Utils::Maximum(code_end, *end);
+  }
+  ASSERT(*start <= *end);
+}
+
+
+ObjectSet* Heap::CreateAllocatedObjectSet() const {
+  Isolate* isolate = Isolate::Current();
+  uword start, end;
+  isolate->heap()->StartEndAddress(&start, &end);
+
+  Isolate* vm_isolate = Dart::vm_isolate();
+  uword vm_start, vm_end;
+  vm_isolate->heap()->StartEndAddress(&vm_start, &vm_end);
+
+  ObjectSet* allocated_set = new ObjectSet(Utils::Minimum(start, vm_start),
+                                           Utils::Maximum(end, vm_end));
+
+  VerifyObjectVisitor object_visitor(isolate, allocated_set);
+  isolate->heap()->IterateObjects(&object_visitor);
+  vm_isolate->heap()->IterateObjects(&object_visitor);
+
+  return allocated_set;
+}
+
+
 bool Heap::Verify() const {
-  VerifyPointersVisitor visitor(Isolate::Current());
-  new_space_->VisitObjectPointers(&visitor);
-  old_space_->VisitObjectPointers(&visitor);
-  code_space_->VisitObjectPointers(&visitor);
+  Isolate* isolate = Isolate::Current();
+  ObjectSet* allocated_set = isolate->heap()->CreateAllocatedObjectSet();
+  VerifyPointersVisitor visitor(isolate, allocated_set);
+  isolate->heap()->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 (%dk of %dk) "
                "Old space (%dk of %dk) "
                "Code space (%dk of %dk)\n",
                (new_space_->in_use() / KB), (new_space_->capacity() / KB),
                (old_space_->in_use() / KB), (old_space_->capacity() / KB),
                (code_space_->in_use() / KB), (code_space_->capacity() / KB));
 }
 
 
 void Heap::Profile(Dart_HeapProfileWriteCallback callback, void* stream) const {
   HeapProfiler profiler(callback, stream);
 
   // Dump the root set.
   HeapProfilerRootVisitor root_visitor(&profiler);
   Isolate* isolate = Isolate::Current();
   Isolate* vm_isolate = Dart::vm_isolate();
   isolate->VisitObjectPointers(&root_visitor, false,
                                StackFrameIterator::kDontValidateFrames);
   HeapProfilerWeakRootVisitor weak_root_visitor(&root_visitor);
   isolate->VisitWeakPersistentHandles(&weak_root_visitor, true);
 
   // Dump the current and VM isolate heaps.
-  HeapProfilerObjectVisitor object_visitor(&profiler);
-  isolate->heap()->new_space_->VisitObjects(&object_visitor);
-  isolate->heap()->old_space_->VisitObjects(&object_visitor);
-  isolate->heap()->code_space_->VisitObjects(&object_visitor);
-  vm_isolate->heap()->new_space_->VisitObjects(&object_visitor);
-  vm_isolate->heap()->old_space_->VisitObjects(&object_visitor);
+  HeapProfilerObjectVisitor object_visitor(isolate, &profiler);
+  isolate->heap()->IterateObjects(&object_visitor);
+  vm_isolate->heap()->IterateObjects(&object_visitor);
 }
 
 
 #if defined(DEBUG)
 NoGCScope::NoGCScope() : StackResource(Isolate::Current()) {
   isolate()->IncrementNoGCScopeDepth();
 }
 
 
 NoGCScope::~NoGCScope() {
   isolate()->DecrementNoGCScopeDepth();
 }
 #endif  // defined(DEBUG)
 
 }  // namespace dart