[vm, gc] Take the space lock for new-space Contains.

Remove several dead Contains variants.

TEST=iso-stress
Bug: #61760
Change-Id: Ic73706016f257f8328f91091bd1ef0460c0b1fb2
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/458062
Commit-Queue: Ryan Macnak <[email protected]>
Reviewed-by: Alexander Aprelev <[email protected]>

Author: rmacnak-google

runtime/vm/heap/heap.cc

@@ -273,22 +273,10 @@ bool Heap::Contains(uword addr) const {
   return new_space_.Contains(addr) || old_space_.Contains(addr);
 }
 
-bool Heap::NewContains(uword addr) const {
-  return new_space_.Contains(addr);
-}
-
-bool Heap::OldContains(uword addr) const {
-  return old_space_.Contains(addr);
-}
-
 bool Heap::CodeContains(uword addr) const {
   return old_space_.CodeContains(addr);
 }
 
-bool Heap::DataContains(uword addr) const {
-  return old_space_.DataContains(addr);
-}
-
 void Heap::VisitObjects(ObjectVisitor* visitor) {
   new_space_.VisitObjects(visitor);
   old_space_.VisitObjects(visitor);

runtime/vm/heap/heap.h

@@ -92,10 +92,7 @@ class Heap {
 
   // Heap contains the specified address.
   bool Contains(uword addr) const;
-  bool NewContains(uword addr) const;
-  bool OldContains(uword addr) const;
   bool CodeContains(uword addr) const;
-  bool DataContains(uword addr) const;
 
   void NotifyIdle(int64_t deadline);
   void NotifyDestroyed();

runtime/vm/heap/pages.cc

@@ -624,15 +624,6 @@ bool PageSpace::CodeContains(uword addr) const {
   return false;
 }
 
-bool PageSpace::DataContains(uword addr) const {
-  for (ExclusivePageIterator it(this); !it.Done(); it.Advance()) {
-    if (!it.page()->is_executable() && it.page()->Contains(addr)) {
-      return true;
-    }
-  }
-  return false;
-}
-
 void PageSpace::AddRegionsToObjectSet(ObjectSet* set) const {
   ASSERT((pages_ != nullptr) || (exec_pages_ != nullptr) ||
          (large_pages_ != nullptr));

runtime/vm/heap/pages.h

@@ -227,8 +227,6 @@ class PageSpace {
   bool Contains(uword addr) const;
   bool ContainsUnsafe(uword addr) const;
   bool CodeContains(uword addr) const;
-  bool DataContains(uword addr) const;
-  bool IsValidAddress(uword addr) const { return Contains(addr); }
 
   void VisitObjects(ObjectVisitor* visitor) const;
   void VisitObjectsNoImagePages(ObjectVisitor* visitor) const;

runtime/vm/heap/scavenger.cc

@@ -804,6 +804,11 @@ Scavenger::~Scavenger() {
   ASSERT(blocks_ == nullptr);
 }
 
+bool Scavenger::Contains(uword addr) const {
+  MutexLocker ml(&space_lock_);
+  return to_->Contains(addr);
+}
+
 intptr_t Scavenger::NewSizeInWords(intptr_t old_size_in_words,
                                    GCReason reason) const {
   intptr_t num_mutators = heap_->isolate_group()->MutatorCount();

runtime/vm/heap/scavenger.h

@@ -132,7 +132,7 @@ class Scavenger {
   // During scavenging both the to and from spaces contain "legal" objects.
   // During a scavenge this function only returns true for addresses that will
   // be part of the surviving objects.
-  bool Contains(uword addr) const { return to_->Contains(addr); }
+  bool Contains(uword addr) const;
 
   uword TryAllocate(Thread* thread, intptr_t size) {
     uword addr = TryAllocateFromTLAB(thread, size);