src/share/vm/gc/g1/concurrentMark.cpp

@@ -1060,11 +1060,11 @@
   if (VerifyDuringGC) {
     HandleMark hm;  // handle scope
     g1h->prepare_for_verify();
     Universe::verify(VerifyOption_G1UsePrevMarking, "During GC (before)");
   }
-  g1h->check_bitmaps("Remark Start");
+  g1h->verifier()->check_bitmaps("Remark Start");
 
   G1CollectorPolicy* g1p = g1h->g1_policy();
   g1p->record_concurrent_mark_remark_start();
 
   double start = os::elapsedTime();

@@ -1109,11 +1109,11 @@
     if (VerifyDuringGC) {
       HandleMark hm;  // handle scope
       g1h->prepare_for_verify();
       Universe::verify(VerifyOption_G1UseNextMarking, "During GC (after)");
     }
-    g1h->check_bitmaps("Remark End");
+    g1h->verifier()->check_bitmaps("Remark End");
     assert(!restart_for_overflow(), "sanity");
     // Completely reset the marking state since marking completed
     set_non_marking_state();
   }
 

@@ -1603,18 +1603,18 @@
   if (has_aborted()) {
     g1h->collector_state()->set_mark_in_progress(false); // So bitmap clearing isn't confused
     return;
   }
 
-  g1h->verify_region_sets_optional();
+  g1h->verifier()->verify_region_sets_optional();
 
   if (VerifyDuringGC) {
     HandleMark hm;  // handle scope
     g1h->prepare_for_verify();
     Universe::verify(VerifyOption_G1UsePrevMarking, "During GC (before)");
   }
-  g1h->check_bitmaps("Cleanup Start");
+  g1h->verifier()->check_bitmaps("Cleanup Start");
 
   G1CollectorPolicy* g1p = g1h->g1_policy();
   g1p->record_concurrent_mark_cleanup_start();
 
   double start = os::elapsedTime();

@@ -1700,13 +1700,13 @@
     HandleMark hm;  // handle scope
     g1h->prepare_for_verify();
     Universe::verify(VerifyOption_G1UsePrevMarking, "During GC (after)");
   }
 
-  g1h->check_bitmaps("Cleanup End");
+  g1h->verifier()->check_bitmaps("Cleanup End");
 
-  g1h->verify_region_sets_optional();
+  g1h->verifier()->verify_region_sets_optional();
 
   // We need to make this be a "collection" so any collection pause that
   // races with it goes around and waits for completeCleanup to finish.
   g1h->increment_total_collections();