From 5245bd707e3a02076e6b71052a534fd7dc0e947b Mon Sep 17 00:00:00 2001
From: Albert Yang <albert.m.yang@oracle.com>
Date: Wed, 4 Oct 2023 16:24:20 +0200
Subject: [PATCH] s1-remove-to-contiguous

---
 src/hotspot/share/gc/serial/cardTableRS.cpp |  8 ++++----
 src/hotspot/share/gc/shared/space.hpp       | 11 -----------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/hotspot/share/gc/serial/cardTableRS.cpp b/src/hotspot/share/gc/serial/cardTableRS.cpp
index e192847dca3ba..2d9ad2723abb8 100644
--- a/src/hotspot/share/gc/serial/cardTableRS.cpp
+++ b/src/hotspot/share/gc/serial/cardTableRS.cpp
@@ -53,7 +53,7 @@
 class DirtyCardToOopClosure: public MemRegionClosure {
 protected:
   OopIterateClosure* _cl;
-  Space* _sp;
+  TenuredSpace* _sp;
   HeapWord* _min_done;          // Need a downwards traversal to compensate
                                 // imprecise write barrier; this is the
                                 // lowest location already done (or,
@@ -88,7 +88,7 @@ class DirtyCardToOopClosure: public MemRegionClosure {
                                HeapWord* bottom, HeapWord* top,
                                OopIterateClosure* cl);
 public:
-  DirtyCardToOopClosure(Space* sp, OopIterateClosure* cl) :
+  DirtyCardToOopClosure(TenuredSpace* sp, OopIterateClosure* cl) :
     _cl(cl), _sp(sp), _min_done(nullptr) {
     NOT_PRODUCT(_last_bottom = nullptr);
   }
@@ -98,7 +98,7 @@ class DirtyCardToOopClosure: public MemRegionClosure {
 
 HeapWord* DirtyCardToOopClosure::get_actual_top(HeapWord* top,
                                                 HeapWord* top_obj) {
-  if (top_obj != nullptr && top_obj < (_sp->toContiguousSpace())->top()) {
+  if (top_obj != nullptr && top_obj < _sp->top()) {
     if (cast_to_oop(top_obj)->is_objArray() || cast_to_oop(top_obj)->is_typeArray()) {
       // An arrayOop is starting on the dirty card - since we do exact
       // store checks for objArrays we are done.
@@ -111,7 +111,7 @@ HeapWord* DirtyCardToOopClosure::get_actual_top(HeapWord* top,
       top = top_obj + cast_to_oop(top_obj)->size();
     }
   } else {
-    top = (_sp->toContiguousSpace())->top();
+    top = _sp->top();
   }
   return top;
 }
diff --git a/src/hotspot/share/gc/shared/space.hpp b/src/hotspot/share/gc/shared/space.hpp
index 588ce38dbd2ac..ca9c97a2fffe3 100644
--- a/src/hotspot/share/gc/shared/space.hpp
+++ b/src/hotspot/share/gc/shared/space.hpp
@@ -211,12 +211,6 @@ class Space: public CHeapObj<mtGC> {
   virtual void print_short() const;
   virtual void print_short_on(outputStream* st) const;
 
-
-  // IF "this" is a ContiguousSpace, return it, else return null.
-  virtual ContiguousSpace* toContiguousSpace() {
-    return nullptr;
-  }
-
   // Debugging
   virtual void verify() const = 0;
 };
@@ -415,11 +409,6 @@ class ContiguousSpace: public Space {
 
   void print_on(outputStream* st) const override;
 
-  // Checked dynamic downcasts.
-  ContiguousSpace* toContiguousSpace() override {
-    return this;
-  }
-
   // Debugging
   void verify() const override;
 };