From 4754f059f99a426cc8c5d94b0809e79d563ffc2e Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Tue, 28 May 2024 14:47:04 +0000
Subject: [PATCH] 8333035: Parallel: Remove ParMarkBitMap::IterationStatus

Reviewed-by: tschatzl
---
 src/hotspot/share/gc/parallel/parMarkBitMap.hpp     | 3 ---
 src/hotspot/share/gc/parallel/psParallelCompact.cpp | 4 +---
 src/hotspot/share/gc/parallel/psParallelCompact.hpp | 7 ++-----
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/parMarkBitMap.hpp b/src/hotspot/share/gc/parallel/parMarkBitMap.hpp
index cedf7aca77c..be905be6e90 100644
--- a/src/hotspot/share/gc/parallel/parMarkBitMap.hpp
+++ b/src/hotspot/share/gc/parallel/parMarkBitMap.hpp
@@ -35,9 +35,6 @@ class ParMarkBitMap: public CHeapObj<mtGC> {
 public:
   typedef BitMap::idx_t idx_t;
 
-  // Values returned by the iterate() methods.
-  enum IterationStatus { incomplete, complete, full };
-
   inline ParMarkBitMap();
   bool initialize(MemRegion covered_region);
 
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
index f544831ca96..48430dbe367 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
@@ -2624,8 +2624,7 @@ void MoveAndUpdateClosure::complete_region(ParCompactionManager *cm, HeapWord *d
   region_ptr->set_completed();
 }
 
-MoveAndUpdateClosure::IterationStatus
-MoveAndUpdateClosure::do_addr(HeapWord* addr, size_t words) {
+void MoveAndUpdateClosure::do_addr(HeapWord* addr, size_t words) {
   assert(destination() != nullptr, "sanity");
   _source = addr;
 
@@ -2648,7 +2647,6 @@ MoveAndUpdateClosure::do_addr(HeapWord* addr, size_t words) {
   }
 
   update_state(words);
-  return is_full() ? ParMarkBitMap::full : ParMarkBitMap::incomplete;
 }
 
 void MoveAndUpdateShadowClosure::complete_region(ParCompactionManager *cm, HeapWord *dest_addr,
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.hpp b/src/hotspot/share/gc/parallel/psParallelCompact.hpp
index 713e9a1f84f..7c16f969e2b 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.hpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.hpp
@@ -904,7 +904,6 @@ class MoveAndUpdateClosure: public StackObj {
 
  public:
   typedef ParMarkBitMap::idx_t idx_t;
-  typedef ParMarkBitMap::IterationStatus IterationStatus;
 
   ParMarkBitMap*        bitmap() const { return _bitmap; }
 
@@ -914,10 +913,8 @@ class MoveAndUpdateClosure: public StackObj {
   void      set_source(HeapWord* addr) { _source = addr; }
 
   // If the object will fit (size <= words_remaining()), copy it to the current
-  // destination, update the interior oops and the start array and return either
-  // full (if the closure is full) or incomplete.  If the object will not fit,
-  // return would_overflow.
-  virtual IterationStatus do_addr(HeapWord* addr, size_t words);
+  // destination, update the interior oops and the start array.
+  void do_addr(HeapWord* addr, size_t words);
 
   inline MoveAndUpdateClosure(ParMarkBitMap* bitmap, size_t region);