Fix verifier handling of weak references when scanning the remembered set

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

@@ -125,7 +125,7 @@ void ShenandoahRootVerifier::oops_do(OopClosure* oops) {
   }
 }
 
-void ShenandoahRootVerifier::roots_do(OopClosure* oops) {
+void ShenandoahRootVerifier::roots_do(OopIterateClosure* oops) {
   ShenandoahGCStateResetter resetter;
   shenandoah_assert_safepoint();
 
@@ -140,7 +140,7 @@ void ShenandoahRootVerifier::roots_do(OopClosure* oops) {
 
   ShenandoahHeap* heap = ShenandoahHeap::heap();
   if (heap->mode()->is_generational() && heap->is_gc_generation_young()) {
-    heap->card_scan()->oops_do(oops);
+    heap->card_scan()->roots_do(oops);
   }
 
   // Do thread roots the last. This allows verification code to find
@@ -149,7 +149,7 @@ void ShenandoahRootVerifier::roots_do(OopClosure* oops) {
   Threads::possibly_parallel_oops_do(true, oops, &blobs);
 }
 
-void ShenandoahRootVerifier::strong_roots_do(OopClosure* oops) {
+void ShenandoahRootVerifier::strong_roots_do(OopIterateClosure* oops) {
   ShenandoahGCStateResetter resetter;
   shenandoah_assert_safepoint();
 
@@ -163,7 +163,7 @@ void ShenandoahRootVerifier::strong_roots_do(OopClosure* oops) {
 
   ShenandoahHeap* heap = ShenandoahHeap::heap();
   if (heap->mode()->is_generational() && heap->is_gc_generation_young()) {
-    heap->card_scan()->oops_do(oops);
+    heap->card_scan()->roots_do(oops);
   }
 
   // Do thread roots the last. This allows verification code to find

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

@@ -64,8 +64,8 @@ class ShenandoahRootVerifier : public StackObj {
   void oops_do(OopClosure* cl);
 
   // Used to seed ShenandoahVerifier, do not honor root type filter
-  void roots_do(OopClosure* cl);
-  void strong_roots_do(OopClosure* cl);
+  void roots_do(OopIterateClosure* cl);
+  void strong_roots_do(OopIterateClosure* cl);
 
   static RootTypes combine(RootTypes t1, RootTypes t2);
 private:

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

@@ -954,7 +954,7 @@ class ShenandoahScanRemembered: public CHeapObj<mtGC> {
   //  from dirty to clean and clean to dirty.  The do_oops
   //  implementations will want to update this value each time they
   //  cross one of these boundaries.
-
+  void roots_do(OopIterateClosure* cl);
   void oops_do(OopClosure* cl);
 };
 

src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.inline.hpp

@@ -591,6 +591,11 @@ class ShenandoahOopIterateAdapter : public BasicOopIterateClosure {
 template<typename RememberedSet>
 inline void ShenandoahScanRemembered<RememberedSet>::oops_do(OopClosure* cl) {
   ShenandoahOopIterateAdapter adapter(cl);
+  roots_do(&adapter);
+}
+
+template<typename RememberedSet>
+inline void ShenandoahScanRemembered<RememberedSet>::roots_do(OopIterateClosure* cl) {
   ShenandoahHeap* heap = ShenandoahHeap::heap();
   for (size_t i = 0, n = heap->num_regions(); i < n; ++i) {
     ShenandoahHeapRegion* region = heap->get_region(i);
@@ -604,7 +609,7 @@ inline void ShenandoahScanRemembered<RememberedSet>::oops_do(OopClosure* cl) {
       size_t num_clusters = (size_t) ((num_heapwords - 1 + cluster_size) / cluster_size);
 
       // Remembered set scanner
-      process_clusters(start_cluster_no, num_clusters, end_of_range, &adapter);
+      process_clusters(start_cluster_no, num_clusters, end_of_range, cl);
     }
   }
 }