8338479: GenShen: Detemplatize ShenandoahScanRemembered

Backport-of: 78277f9f6e61ecc61eddd3fa72d963f08d7e754f

Author: William Kemper

src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp

@@ -89,9 +89,9 @@ class ShenandoahResetBitmapTask : public ShenandoahHeapRegionClosure {
 // write-copy.
 class ShenandoahMergeWriteTable: public ShenandoahHeapRegionClosure {
  private:
-  RememberedScanner* _scanner;
+  ShenandoahScanRemembered* _scanner;
  public:
-  ShenandoahMergeWriteTable(RememberedScanner* scanner) : _scanner(scanner) {}
+  ShenandoahMergeWriteTable(ShenandoahScanRemembered* scanner) : _scanner(scanner) {}
 
   void heap_region_do(ShenandoahHeapRegion* r) override {
     assert(r->is_old(), "Don't waste time doing this for non-old regions");
@@ -105,9 +105,9 @@ class ShenandoahMergeWriteTable: public ShenandoahHeapRegionClosure {
 
 class ShenandoahCopyWriteCardTableToRead: public ShenandoahHeapRegionClosure {
  private:
-  RememberedScanner* _scanner;
+  ShenandoahScanRemembered* _scanner;
  public:
-  ShenandoahCopyWriteCardTableToRead(RememberedScanner* scanner) : _scanner(scanner) {}
+  ShenandoahCopyWriteCardTableToRead(ShenandoahScanRemembered* scanner) : _scanner(scanner) {}
 
   void heap_region_do(ShenandoahHeapRegion* region) override {
     assert(region->is_old(), "Don't waste time doing this for non-old regions");
@@ -850,7 +850,7 @@ void ShenandoahGeneration::scan_remembered_set(bool is_concurrent) {
   heap->assert_gc_workers(nworkers);
   heap->workers()->run_task(&task);
   if (ShenandoahEnableCardStats) {
-    RememberedScanner* scanner = heap->old_generation()->card_scan();
+    ShenandoahScanRemembered* scanner = heap->old_generation()->card_scan();
     assert(scanner != nullptr, "Not generational");
     scanner->log_card_stats(nworkers, CARD_STAT_SCAN_RS);
   }

src/hotspot/share/gc/shenandoah/shenandoahGenerationalEvacuationTask.cpp

@@ -150,7 +150,7 @@ void ShenandoahGenerationalEvacuationTask::promote_in_place(ShenandoahHeapRegion
   //
   // Rebuilding the remembered set consists of clearing all object registrations (reset_object_range()) here,
   // then registering every live object and every coalesced range of free objects in the loop that follows.
-  RememberedScanner* const scanner = old_gen->card_scan();
+  ShenandoahScanRemembered* const scanner = old_gen->card_scan();
   scanner->reset_object_range(region->bottom(), region->end());
   scanner->mark_range_as_dirty(region->bottom(), region->get_top_before_promote() - region->bottom());
 
@@ -270,7 +270,7 @@ void ShenandoahGenerationalEvacuationTask::promote_humongous(ShenandoahHeapRegio
 
   // Since this region may have served previously as OLD, it may hold obsolete object range info.
   HeapWord* const humongous_bottom = region->bottom();
-  RememberedScanner* const scanner = old_gen->card_scan();
+  ShenandoahScanRemembered* const scanner = old_gen->card_scan();
   scanner->reset_object_range(humongous_bottom, humongous_bottom + spanned_regions * ShenandoahHeapRegion::region_size_words());
   // Since the humongous region holds only one object, no lock is necessary for this register_object() invocation.
   scanner->register_object_without_lock(humongous_bottom);

src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.cpp

@@ -857,7 +857,7 @@ class ShenandoahGenerationalUpdateHeapRefsTask : public WorkerTask {
       // The remembered set workload is better balanced between threads, so threads that are "behind" can catch up with other
       // threads during this phase, allowing all threads to work more effectively in parallel.
       struct ShenandoahRegionChunk assignment;
-      RememberedScanner* scanner = _heap->old_generation()->card_scan();
+      ShenandoahScanRemembered* scanner = _heap->old_generation()->card_scan();
 
       while (!_heap->check_cancelled_gc_and_yield(CONCURRENT) && _work_chunks->next(&assignment)) {
         // Keep grabbing next work chunk to process until finished, or asked to yield
@@ -950,7 +950,7 @@ class ShenandoahGenerationalUpdateHeapRefsTask : public WorkerTask {
             // This is a young evac..
             if (start_of_range < end_of_range) {
               size_t cluster_size =
-                      CardTable::card_size_in_words() * ShenandoahCardCluster<ShenandoahDirectCardMarkRememberedSet>::CardsPerCluster;
+                      CardTable::card_size_in_words() * ShenandoahCardCluster::CardsPerCluster;
               size_t clusters = assignment._chunk_size / cluster_size;
               assert(clusters * cluster_size == assignment._chunk_size, "Chunk assignment must align on cluster boundaries");
               scanner->process_region_slice(r, assignment._chunk_offset, clusters, end_of_range, &cl, true, worker_id);
@@ -979,7 +979,7 @@ void ShenandoahGenerationalHeap::update_heap_references(bool concurrent) {
 
   if (ShenandoahEnableCardStats) {
     // Only do this if we are collecting card stats
-    RememberedScanner* card_scan = old_generation()->card_scan();
+    ShenandoahScanRemembered* card_scan = old_generation()->card_scan();
     assert(card_scan != nullptr, "Card table must exist when card stats are enabled");
     card_scan->log_card_stats(nworkers, CARD_STAT_UPDATE_REFS);
   }

src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp

@@ -523,7 +523,7 @@ void ShenandoahHeapRegion::oop_iterate_humongous_slice(OopIterateClosure* blk, b
          "slice must be integral number of cards");
 
   oop obj = cast_to_oop(r->bottom());
-  RememberedScanner* scanner = heap->old_generation()->card_scan();
+  ShenandoahScanRemembered* scanner = heap->old_generation()->card_scan();
   size_t card_index = scanner->card_index_for_addr(start);
   size_t num_cards = words / CardTable::card_size_in_words();
 

src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp

@@ -194,7 +194,7 @@ ShenandoahOldGeneration::ShenandoahOldGeneration(uint max_queues, size_t max_cap
     ShenandoahCardTable* card_table = ShenandoahBarrierSet::barrier_set()->card_table();
     size_t card_count = card_table->cards_required(ShenandoahHeap::heap()->reserved_region().word_size());
     auto rs = new ShenandoahDirectCardMarkRememberedSet(card_table, card_count);
-    _card_scan = new ShenandoahScanRemembered<ShenandoahDirectCardMarkRememberedSet>(rs);
+    _card_scan = new ShenandoahScanRemembered(rs);
   }
 }
 

src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.hpp

@@ -177,10 +177,10 @@ class ShenandoahOldGeneration : public ShenandoahGeneration {
   void abandon_mixed_evacuations();
 
 private:
-  RememberedScanner* _card_scan;
+  ShenandoahScanRemembered* _card_scan;
 
 public:
-  RememberedScanner* card_scan() { return _card_scan; }
+  ShenandoahScanRemembered* card_scan() { return _card_scan; }
 
   // Clear cards for given region
   void clear_cards_for(ShenandoahHeapRegion* region);