- Avoid inconsistency of for example IterateObjects vs VisitObjects.

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 193 matching lines @@
 bool Heap::OldContains(uword addr) const {
   return old_space_->Contains(addr);
 }
 
 
 bool Heap::CodeContains(uword addr) const {
   return old_space_->Contains(addr, HeapPage::kExecutable);
 }
 
 
-void Heap::IterateObjects(ObjectVisitor* visitor) const {
+void Heap::VisitObjects(ObjectVisitor* visitor) const {
   new_space_->VisitObjects(visitor);
   old_space_->VisitObjects(visitor);
 }
 
 
-void Heap::IteratePointers(ObjectPointerVisitor* visitor) const {
+void Heap::VisitObjectPointers(ObjectPointerVisitor* visitor) const {
   new_space_->VisitObjectPointers(visitor);
   old_space_->VisitObjectPointers(visitor);
 }
 
 
-void Heap::IterateNewPointers(ObjectPointerVisitor* visitor) const {
-  new_space_->VisitObjectPointers(visitor);
-}
-
-
-void Heap::IterateOldPointers(ObjectPointerVisitor* visitor) const {
-  old_space_->VisitObjectPointers(visitor);
-}
-
-
-void Heap::IterateNewObjects(ObjectVisitor* visitor) const {
-  new_space_->VisitObjects(visitor);
-}
-
-
-void Heap::IterateOldObjects(ObjectVisitor* visitor) const {
-  old_space_->VisitObjects(visitor);
-}
-
-
 RawInstructions* Heap::FindObjectInCodeSpace(FindObjectVisitor* visitor) const {
   // Only executable pages can have RawInstructions objects.
   RawObject* raw_obj = old_space_->FindObject(visitor, HeapPage::kExecutable);
   ASSERT((raw_obj == Object::null()) ||
          (raw_obj->GetClassId() == kInstructionsCid));
   return reinterpret_cast<RawInstructions*>(raw_obj);
 }
 
 
 RawObject* Heap::FindOldObject(FindObjectVisitor* visitor) const {
@@ skipping 219 matching lines @@
   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, mark_expectation);
-    this->IterateObjects(&object_visitor);
+    this->VisitObjects(&object_visitor);
   }
   {
     // VM isolate heap is premarked.
     VerifyObjectVisitor vm_object_visitor(
         isolate(), allocated_set, kRequireMarked);
-    vm_isolate->heap()->IterateObjects(&vm_object_visitor);
+    vm_isolate->heap()->VisitObjects(&vm_object_visitor);
   }
   return allocated_set;
 }
 
 
 bool Heap::Verify(MarkExpectation mark_expectation) const {
   ObjectSet* allocated_set = CreateAllocatedObjectSet(mark_expectation);
   VerifyPointersVisitor visitor(isolate(), allocated_set);
-  IteratePointers(&visitor);
+  VisitObjectPointers(&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) "
                "Old space (%" Pd "k of %" Pd "k)\n",
                (UsedInWords(kNew) / KBInWords),
@@ skipping 223 matching lines @@
     heap->DisableGrowthControl();
 }
 
 
 NoHeapGrowthControlScope::~NoHeapGrowthControlScope() {
     Heap* heap = reinterpret_cast<Isolate*>(isolate())->heap();
     heap->SetGrowthControlState(current_growth_controller_state_);
 }
 
 }  // namespace dart