8052170: G1 asserts at collection exit with -XX:-G1DeferredRSUpdate

Summary: Do not try to verify timing measures for the redirty logged cards phase when it is not executed.
Reviewed-by: brutisso, jmasa

src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp

@@ -236,8 +236,10 @@ void G1GCPhaseTimes::note_gc_end() {
   _last_gc_worker_times_ms.verify();
   _last_gc_worker_other_times_ms.verify();
 
+  if (G1DeferredRSUpdate) {
     _last_redirty_logged_cards_time_ms.verify();
     _last_redirty_logged_cards_processed_cards.verify();
+  }
 }
 
 void G1GCPhaseTimes::note_string_dedup_fixup_start() {

test/gc/g1/TestDeferredRSUpdate.java

@@ -23,7 +23,7 @@
 
 /*
  * @test TestDeferredRSUpdate
- * @bug 8040977
+ * @bug 8040977 8052170
  * @summary Ensure that running with -XX:-G1DeferredRSUpdate does not crash the VM
  * @key gc
  * @library /testlibrary
@@ -38,6 +38,7 @@ public class TestDeferredRSUpdate {
 
     ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseG1GC",
                                                               "-Xmx10M",
+                                                              "-XX:+PrintGCDetails",
                                                               // G1DeferredRSUpdate is a develop option, but we cannot limit execution of this test to only debug VMs.
                                                               "-XX:+IgnoreUnrecognizedVMOptions",
                                                               "-XX:-G1DeferredRSUpdate",