From 6b4a5d87049f2dd57b003bc1127d21387d8511b1 Mon Sep 17 00:00:00 2001 From: ddong Date: Thu, 16 Jan 2020 10:47:16 +0800 Subject: [PATCH] 8232355: Two obsolete flags have the wrong obsolete version in 8u Summary: Correct the obsolete version of UseOldInlining and AutoShutdownNMT, and delete UseOldInlining in c2_globals.hpp Reviewed-by: phh --- src/share/vm/opto/c2_globals.hpp | 3 --- src/share/vm/runtime/arguments.cpp | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/share/vm/opto/c2_globals.hpp b/src/share/vm/opto/c2_globals.hpp index 3aab4335b..96b5cd164 100644 --- a/src/share/vm/opto/c2_globals.hpp +++ b/src/share/vm/opto/c2_globals.hpp @@ -360,9 +360,6 @@ "File to dump ideal graph to. If set overrides the " \ "use of the network") \ \ - product(bool, UseOldInlining, true, \ - "Enable the 1.3 inlining strategy") \ - \ product(bool, UseBimorphicInlining, true, \ "Profiling based inlining for two receivers") \ \ diff --git a/src/share/vm/runtime/arguments.cpp b/src/share/vm/runtime/arguments.cpp index 2665b6b8c..e4b1159ae 100644 --- a/src/share/vm/runtime/arguments.cpp +++ b/src/share/vm/runtime/arguments.cpp @@ -302,8 +302,8 @@ static ObsoleteFlag obsolete_jvm_flags[] = { { "UsePermISM", JDK_Version::jdk(8), JDK_Version::jdk(9) }, { "UseMPSS", JDK_Version::jdk(8), JDK_Version::jdk(9) }, { "UseStringCache", JDK_Version::jdk(8), JDK_Version::jdk(9) }, - { "UseOldInlining", JDK_Version::jdk(9), JDK_Version::jdk(10) }, - { "AutoShutdownNMT", JDK_Version::jdk(9), JDK_Version::jdk(10) }, + { "UseOldInlining", JDK_Version::jdk_update(8, 20), JDK_Version::jdk(10) }, + { "AutoShutdownNMT", JDK_Version::jdk_update(8, 40), JDK_Version::jdk(10) }, { "CompilationRepeat", JDK_Version::jdk(8), JDK_Version::jdk(9) }, #ifdef PRODUCT { "DesiredMethodLimit", -- GitLab