OpenJDK / zgc / zgc
changeset 51283:cc318277c142
8205702: assert(UseCompressedClassPointers) failed in universe.hpp
Reviewed-by: coleenp, ccheung
author | pliden |
---|---|
date | Thu, 28 Jun 2018 07:22:59 +0200 |
parents | 9084fd587141 |
children | 2c3edd0a6222 |
files | src/hotspot/share/runtime/arguments.cpp test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions.java |
diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/runtime/arguments.cpp Thu Jun 28 07:00:35 2018 +0200 +++ b/src/hotspot/share/runtime/arguments.cpp Thu Jun 28 07:22:59 2018 +0200 @@ -3900,13 +3900,13 @@ jint result = set_ergonomics_flags(); if (result != JNI_OK) return result; - set_shared_spaces_flags(); - // Set heap size based on available physical memory set_heap_size(); GCConfig::arguments()->initialize(); + set_shared_spaces_flags(); + // Initialize Metaspace flags and alignments Metaspace::ergo_initialize();
--- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions.java Thu Jun 28 07:00:35 2018 +0200 +++ b/test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions.java Thu Jun 28 07:22:59 2018 +0200 @@ -39,6 +39,7 @@ */ import jdk.test.lib.Asserts; +import jdk.test.lib.Platform; import jdk.test.lib.process.OutputAnalyzer; import sun.hotspot.code.Compiler; @@ -62,6 +63,9 @@ // Uncompressed OOPs testDump(1, "-XX:+UseG1GC", "-XX:-UseCompressedOops", COOPS_DUMP_WARNING, true); + if (Platform.isLinux() && Platform.isX64()) { + testDump(1, "-XX:+UnlockExperimentalVMOptions", "-XX:+UseZGC", COOPS_DUMP_WARNING, true); + } // incompatible GCs testDump(2, "-XX:+UseParallelGC", "", GC_WARNING, false);