--- a/src/hotspot/share/runtime/arguments.cpp Thu Apr 26 13:40:58 2018 -0700
+++ b/src/hotspot/share/runtime/arguments.cpp Mon May 07 18:48:36 2018 -0400
@@ -518,6 +518,7 @@
{ "PrintSafepointStatisticsTimeout", JDK_Version::jdk(11), JDK_Version::jdk(12), JDK_Version::jdk(13) },
{ "PrintSafepointStatisticsCount",JDK_Version::jdk(11), JDK_Version::jdk(12), JDK_Version::jdk(13) },
{ "AggressiveOpts", JDK_Version::jdk(11), JDK_Version::jdk(12), JDK_Version::jdk(13) },
+ { "AllowNonVirtualCalls", JDK_Version::jdk(11), JDK_Version::jdk(12), JDK_Version::jdk(13) },
// --- 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() },
--- a/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java Thu Apr 26 13:40:58 2018 -0700
+++ b/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java Mon May 07 18:48:36 2018 -0400
@@ -52,6 +52,7 @@
{"PrintSafepointStatisticsCount", "3"},
{"PrintSafepointStatisticsTimeout", "3"},
{"AggressiveOpts", "true"},
+ {"AllowNonVirtualCalls", "true"},
// deprecated alias flags (see also aliased_jvm_flags):
{"DefaultMaxRAMFraction", "4"},