From d02bc873f806c90754da10c8a052e32836e895fd Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Thu, 14 Dec 2023 21:24:17 +0000
Subject: [PATCH] 8309981: Remove expired flags in JDK 23

Reviewed-by: alanb, kvn
---
 src/hotspot/share/runtime/arguments.cpp |  7 -------
 src/java.base/share/man/java.1          | 18 +++++++++++++-----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 37e3abf2ba1..ac83e1cf9d3 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -525,13 +525,6 @@ static SpecialFlag const special_jvm_flags[] = {
   { "G1ConcRSHotCardLimit",         JDK_Version::undefined(), JDK_Version::jdk(21), JDK_Version::undefined() },
   { "RefDiscoveryPolicy",           JDK_Version::undefined(), JDK_Version::jdk(21), JDK_Version::undefined() },
   { "MetaspaceReclaimPolicy",       JDK_Version::undefined(), JDK_Version::jdk(21), JDK_Version::undefined() },
-  { "DoReserveCopyInSuperWord",     JDK_Version::undefined(), JDK_Version::jdk(22), JDK_Version::jdk(23) },
-  { "UseCounterDecay",              JDK_Version::undefined(), JDK_Version::jdk(22), JDK_Version::jdk(23) },
-
-#ifdef LINUX
-  { "UseHugeTLBFS",                 JDK_Version::undefined(), JDK_Version::jdk(22), JDK_Version::jdk(23) },
-  { "UseSHM",                       JDK_Version::undefined(), JDK_Version::jdk(22), JDK_Version::jdk(23) },
-#endif
 
 #ifdef ASSERT
   { "DummyObsoleteTestFlag",        JDK_Version::undefined(), JDK_Version::jdk(18), JDK_Version::undefined() },
diff --git a/src/java.base/share/man/java.1 b/src/java.base/share/man/java.1
index ece26077424..1b096f67a23 100644
--- a/src/java.base/share/man/java.1
+++ b/src/java.base/share/man/java.1
@@ -36,7 +36,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "JAVA" "1" "2024" "JDK 22-ea" "JDK Commands"
+.TH "JAVA" "1" "2024" "JDK 23-ea" "JDK Commands"
 .hy
 .SH NAME
 .PP
@@ -187,7 +187,7 @@ with new values added and old values removed.
 You\[aq]ll get an error message if you use a value of \f[I]N\f[R] that
 is no longer supported.
 The supported values of \f[I]N\f[R] are the current Java SE release
-(\f[V]22\f[R]) and a limited number of previous releases, detailed in
+(\f[V]23\f[R]) and a limited number of previous releases, detailed in
 the command-line help for \f[V]javac\f[R], under the \f[V]--source\f[R]
 and \f[V]--release\f[R] options.
 .RE
@@ -3790,6 +3790,14 @@ Controlled \f[I]relaxed strong encapsulation\f[R], as defined in
 This option was deprecated in JDK 16 by \f[B]JEP 396\f[R]
 [https://openjdk.org/jeps/396] and made obsolete in JDK 17 by \f[B]JEP
 403\f[R] [https://openjdk.org/jeps/403].
+.SH REMOVED JAVA OPTIONS
+.PP
+These \f[V]java\f[R] options have been removed in JDK 23 and using them
+results in an error of:
+.RS
+.PP
+\f[V]Unrecognized VM option\f[R] \f[I]option-name\f[R]
+.RE
 .TP
 \f[V]-XX:+UseHugeTLBFS\f[R]
 \f[B]Linux only:\f[R] This option is the equivalent of specifying
@@ -3803,13 +3811,13 @@ you want this behavior.
 \f[V]-XX:+UseSHM\f[R]
 \f[B]Linux only:\f[R] Enables the JVM to use shared memory to set up
 large pages.
-.SH REMOVED JAVA OPTIONS
-.PP
-No documented java options have been removed in JDK 22.
 .PP
 For the lists and descriptions of options removed in previous releases
 see the \f[I]Removed Java Options\f[R] section in:
 .IP \[bu] 2
+\f[B]The \f[VB]java\f[B] Command, Release 22\f[R]
+[https://docs.oracle.com/en/java/javase/22/docs/specs/man/java.html]
+.IP \[bu] 2
 \f[B]The \f[VB]java\f[B] Command, Release 21\f[R]
 [https://docs.oracle.com/en/java/javase/21/docs/specs/man/java.html]
 .IP \[bu] 2