changeset 46656:ff494a8dcce9

Merge
author hseigel
date Wed, 12 Jul 2017 12:46:31 +0000
parents 149aa826a8bf d5ecb8ef2b93
children cc4ac8d1ef6b
files
diffstat 2 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/src/share/vm/runtime/arguments.cpp	Wed Jul 12 11:26:11 2017 +0000
+++ b/hotspot/src/share/vm/runtime/arguments.cpp	Wed Jul 12 12:46:31 2017 +0000
@@ -319,7 +319,7 @@
  *               Add a deprecation warning for an option (or alias) by adding an entry in the
  *               "special_jvm_flags" table and setting the "deprecated_in" field.
  *               Often an option "deprecated" in one major release will
- *               be made "obsolete" in the next. In this case the entry should also have it's
+ *               be made "obsolete" in the next. In this case the entry should also have its
  *               "obsolete_in" field set.
  *
  *     OBSOLETE: An option that has been removed (and deleted from globals.hpp), but is still accepted
@@ -380,8 +380,10 @@
   { "UseConcMarkSweepGC",           JDK_Version::jdk(9), JDK_Version::undefined(), JDK_Version::undefined() },
 
   // --- Deprecated alias flags (see also aliased_jvm_flags) - sorted by obsolete_in then expired_in:
-  { "DefaultMaxRAMFraction",        JDK_Version::jdk(8), JDK_Version::undefined(), JDK_Version::undefined() },
-  { "CreateMinidumpOnCrash",        JDK_Version::jdk(9), JDK_Version::undefined(), JDK_Version::undefined() },
+  { "DefaultMaxRAMFraction",        JDK_Version::jdk(8),  JDK_Version::undefined(), JDK_Version::undefined() },
+  { "CreateMinidumpOnCrash",        JDK_Version::jdk(9),  JDK_Version::undefined(), JDK_Version::undefined() },
+  { "MustCallLoadClassInternal",    JDK_Version::jdk(10), JDK_Version::undefined(), JDK_Version::undefined() },
+  { "UnsyncloadClass",              JDK_Version::jdk(10), JDK_Version::undefined(), JDK_Version::undefined() },
 
   // -------------- Obsolete Flags - sorted by expired_in --------------
   { "ConvertSleepToYield",           JDK_Version::jdk(9),      JDK_Version::jdk(10), JDK_Version::jdk(11) },
--- a/hotspot/test/runtime/CommandLine/VMDeprecatedOptions.java	Wed Jul 12 11:26:11 2017 +0000
+++ b/hotspot/test/runtime/CommandLine/VMDeprecatedOptions.java	Wed Jul 12 12:46:31 2017 +0000
@@ -40,7 +40,9 @@
      */
     public static final String[][] DEPRECATED_OPTIONS = {
         // deprecated non-alias flags:
-        {"MaxGCMinorPauseMillis", "1032"},
+        {"MaxGCMinorPauseMillis",     "1032"},
+        {"MustCallLoadClassInternal", "false"},
+        {"UnsyncloadClass",           "false"},
 
         // deprecated alias flags (see also aliased_jvm_flags):
         {"DefaultMaxRAMFraction", "4"},