Mercurial > hg > truffle
changeset 20308:9b093813caa9
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
author | tschatzl |
---|---|
date | Thu, 07 Aug 2014 22:28:16 +0200 |
parents | 04d77ac27223 |
children | a08bb8e45ba1 |
files | src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp test/gc/g1/TestDeferredRSUpdate.java |
diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp Thu Jul 31 09:23:24 2014 +0200 +++ b/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp Thu Aug 07 22:28:16 2014 +0200 @@ -236,8 +236,10 @@ _last_gc_worker_times_ms.verify(); _last_gc_worker_other_times_ms.verify(); - _last_redirty_logged_cards_time_ms.verify(); - _last_redirty_logged_cards_processed_cards.verify(); + if (G1DeferredRSUpdate) { + _last_redirty_logged_cards_time_ms.verify(); + _last_redirty_logged_cards_processed_cards.verify(); + } } void G1GCPhaseTimes::note_string_dedup_fixup_start() {
--- a/test/gc/g1/TestDeferredRSUpdate.java Thu Jul 31 09:23:24 2014 +0200 +++ b/test/gc/g1/TestDeferredRSUpdate.java Thu Aug 07 22:28:16 2014 +0200 @@ -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 @@ 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",