src/hotspot/share/gc/g1/g1FullCollector.cpp

rev 48019 : 8191821: Finer granularity for GC verification
Reviewed-by:

@@ -243,12 +243,12 @@
 void G1FullCollector::run_task(AbstractGangTask* task) {
   _heap->workers()->run_task(task, _num_workers);
 }
 
 void G1FullCollector::verify_after_marking() {
-  if (!VerifyDuringGC) {
-    //Only do verification if VerifyDuringGC is set.
+  if (!VerifyDuringGC || !_heap->verifier()->should_verify(G1HeapVerifier::G1VerifyFull)) {
+    //Only do verification if VerifyDuringGC and Verify_Full is set.
     return;
   }
 
   HandleMark hm;  // handle scope
 #if COMPILER2_OR_JVMCI

@@ -263,8 +263,8 @@
   // used when verifying the dictionaries and so removing them
   // from the mark word can make verification of the dictionaries
   // fail. At the end of the GC, the original mark word values
   // (including hash values) are restored to the appropriate
   // objects.
-  GCTraceTime(Info, gc, verify)("During GC (full)");
+  GCTraceTime(Info, gc, verify)("Verifying During GC (full)");
   _heap->verify(VerifyOption_G1UseFullMarking);
 }