From 00223c1ca5fb815944478cbba4d31dcf9dd23253 Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Mon, 7 May 2018 18:48:36 -0400
Subject: [PATCH] 8202606: Deprecate AllowNonVirtualCalls option

Reviewed-by: hseigel, dholmes
---
 src/hotspot/share/runtime/arguments.cpp                         | 1 +
 test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 808fb8f9152..3ad5fc34a07 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -518,6 +518,7 @@ static SpecialFlag const special_jvm_flags[] = {
   { "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() },
diff --git a/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java b/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java
index c49996d4914..17900fbe0df 100644
--- a/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java
+++ b/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java
@@ -52,6 +52,7 @@ public class VMDeprecatedOptions {
         {"PrintSafepointStatisticsCount", "3"},
         {"PrintSafepointStatisticsTimeout", "3"},
         {"AggressiveOpts", "true"},
+        {"AllowNonVirtualCalls", "true"},
 
         // deprecated alias flags (see also aliased_jvm_flags):
         {"DefaultMaxRAMFraction", "4"},