--- old/src/hotspot/share/runtime/arguments.cpp	2018-06-27 23:18:35.292904564 +0200
+++ new/src/hotspot/share/runtime/arguments.cpp	2018-06-27 23:18:35.024892988 +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();
 
--- old/test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions.java	2018-06-27 23:18:35.702922275 +0200
+++ new/test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions.java	2018-06-27 23:18:35.432910612 +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);