From 342ccf69031fc7e0da7aed252153c9315b818210 Mon Sep 17 00:00:00 2001 From: Patricio Chilano Mateo <pchilanomate@openjdk.org> Date: Thu, 19 Nov 2020 14:12:41 +0000 Subject: [PATCH] 8256253: Defer Biased Locking obsoletion to JDK 18 Reviewed-by: dholmes, coleenp, dcubed, mdoerr --- src/hotspot/share/runtime/arguments.cpp | 18 +++++++++--------- .../gtest/runtime/test_special_flags.cpp | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp index d85495ad298..bb3d44d3690 100644 --- a/src/hotspot/share/runtime/arguments.cpp +++ b/src/hotspot/share/runtime/arguments.cpp @@ -521,15 +521,15 @@ static SpecialFlag const special_jvm_flags[] = { { "UseMembar", JDK_Version::jdk(10), JDK_Version::jdk(12), JDK_Version::undefined() }, { "AllowRedefinitionToAddDeleteMethods", JDK_Version::jdk(13), JDK_Version::undefined(), JDK_Version::undefined() }, { "FlightRecorder", JDK_Version::jdk(13), JDK_Version::undefined(), JDK_Version::undefined() }, - { "UseBiasedLocking", JDK_Version::jdk(15), JDK_Version::jdk(16), JDK_Version::jdk(17) }, - { "BiasedLockingStartupDelay", JDK_Version::jdk(15), JDK_Version::jdk(16), JDK_Version::jdk(17) }, - { "PrintBiasedLockingStatistics", JDK_Version::jdk(15), JDK_Version::jdk(16), JDK_Version::jdk(17) }, - { "BiasedLockingBulkRebiasThreshold", JDK_Version::jdk(15), JDK_Version::jdk(16), JDK_Version::jdk(17) }, - { "BiasedLockingBulkRevokeThreshold", JDK_Version::jdk(15), JDK_Version::jdk(16), JDK_Version::jdk(17) }, - { "BiasedLockingDecayTime", JDK_Version::jdk(15), JDK_Version::jdk(16), JDK_Version::jdk(17) }, - { "UseOptoBiasInlining", JDK_Version::jdk(15), JDK_Version::jdk(16), JDK_Version::jdk(17) }, - { "PrintPreciseBiasedLockingStatistics", JDK_Version::jdk(15), JDK_Version::jdk(16), JDK_Version::jdk(17) }, - { "CriticalJNINatives", JDK_Version::jdk(16), JDK_Version::jdk(17), JDK_Version::jdk(18) }, + { "CriticalJNINatives", JDK_Version::jdk(16), JDK_Version::jdk(17), JDK_Version::jdk(18) }, + { "UseBiasedLocking", JDK_Version::jdk(15), JDK_Version::jdk(18), JDK_Version::jdk(19) }, + { "BiasedLockingStartupDelay", JDK_Version::jdk(15), JDK_Version::jdk(18), JDK_Version::jdk(19) }, + { "PrintBiasedLockingStatistics", JDK_Version::jdk(15), JDK_Version::jdk(18), JDK_Version::jdk(19) }, + { "BiasedLockingBulkRebiasThreshold", JDK_Version::jdk(15), JDK_Version::jdk(18), JDK_Version::jdk(19) }, + { "BiasedLockingBulkRevokeThreshold", JDK_Version::jdk(15), JDK_Version::jdk(18), JDK_Version::jdk(19) }, + { "BiasedLockingDecayTime", JDK_Version::jdk(15), JDK_Version::jdk(18), JDK_Version::jdk(19) }, + { "UseOptoBiasInlining", JDK_Version::jdk(15), JDK_Version::jdk(18), JDK_Version::jdk(19) }, + { "PrintPreciseBiasedLockingStatistics", JDK_Version::jdk(15), JDK_Version::jdk(18), JDK_Version::jdk(19) }, // --- 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/gtest/runtime/test_special_flags.cpp b/test/hotspot/gtest/runtime/test_special_flags.cpp index 14e803f4cf5..eaff1ff18dc 100644 --- a/test/hotspot/gtest/runtime/test_special_flags.cpp +++ b/test/hotspot/gtest/runtime/test_special_flags.cpp @@ -30,7 +30,7 @@ // The test will only fail late in the release cycle as a reminder, // in case it has been forgotten. #ifdef ASSERT -TEST_VM(DISABLED_special_flags, verify_special_flags) { +TEST_VM(special_flags, verify_special_flags) { ASSERT_TRUE(Arguments::verify_special_jvm_flags(true)) << "Special flag verification failed"; } #endif