src/hotspot/share/runtime/arguments.cpp

*** 543,552 ****
--- 543,553 ----
    { "SharedReadWriteSize",           JDK_Version::undefined(), JDK_Version::jdk(10), JDK_Version::undefined() },
    { "SharedReadOnlySize",            JDK_Version::undefined(), JDK_Version::jdk(10), JDK_Version::undefined() },
    { "SharedMiscDataSize",            JDK_Version::undefined(), JDK_Version::jdk(10), JDK_Version::undefined() },
    { "SharedMiscCodeSize",            JDK_Version::undefined(), JDK_Version::jdk(10), JDK_Version::undefined() },
    { "UseUTCFileTimestamp",           JDK_Version::undefined(), JDK_Version::jdk(11), JDK_Version::jdk(12) },
+   { "UseAppCDS",                     JDK_Version::undefined(), JDK_Version::jdk(11), JDK_Version::jdk(12) },
  
  #ifdef TEST_VERIFY_SPECIAL_JVM_FLAGS
    { "dep > obs",                    JDK_Version::jdk(9), JDK_Version::jdk(8), JDK_Version::undefined() },
    { "dep > exp ",                   JDK_Version::jdk(9), JDK_Version::undefined(), JDK_Version::jdk(8) },
    { "obs > exp ",                   JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(8) },
*** 3887,3904 ****
      if (match_option(option, "-XX:+PrintFlagsWithComments")) {
        CommandLineFlags::printFlags(tty, true);
        vm_exit(0);
      }
  #endif
- 
-     if (match_option(option, "-XX:+UseAppCDS")) {
-       Flag* flag = Flag::find_flag("SharedArchiveFile", 17, true, true);
-       if (flag->is_diagnostic()) {
-         flag->clear_diagnostic();
-       }
-       continue;
-     }
    }
    return JNI_OK;
  }
  
  static void print_options(const JavaVMInitArgs *args) {
--- 3888,3897 ----