8265313: Obsolete the unused AssertOnSuspendWaitFailure and TraceSuspendWaitFailures flags

David Holmes · David Holmes · commit 73d5f3b586ab · 2021-04-18T04:26:57.000Z
Reviewed-by: shade, hseigel, dcubed
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
@@ -538,6 +538,8 @@ static SpecialFlag const special_jvm_flags[] = {
   { "TLABStats",                    JDK_Version::jdk(12), JDK_Version::undefined(), JDK_Version::undefined() },
 
   // -------------- Obsolete Flags - sorted by expired_in --------------
+  { "AssertOnSuspendWaitFailure",   JDK_Version::undefined(), JDK_Version::jdk(17), JDK_Version::jdk(18) },
+  { "TraceSuspendWaitFailures",     JDK_Version::undefined(), JDK_Version::jdk(17), JDK_Version::jdk(18) },
 #ifdef ASSERT
   { "DummyObsoleteTestFlag",        JDK_Version::undefined(), JDK_Version::jdk(17), JDK_Version::undefined() },
 #endif
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
@@ -436,12 +436,6 @@ const intx ObjectAlignmentInBytes = 8;
           "Milliseconds to delay per retry (* current_retry_count)")        \
           range(0, max_intx)                                                \
                                                                             \
-  product(bool, AssertOnSuspendWaitFailure, false,                          \
-          "Assert/Guarantee on external suspend wait failure")              \
-                                                                            \
-  product(bool, TraceSuspendWaitFailures, false,                            \
-          "Trace external suspend wait failures")                           \
-                                                                            \
   product(bool, MaxFDLimit, true,                                           \
           "Bump the number of file descriptors to maximum (Unix only)")     \
                                                                             \

Original file line number	Diff line number	Diff line change
`@@ -436,12 +436,6 @@ const intx ObjectAlignmentInBytes = 8;`
`436`	`436`	`"Milliseconds to delay per retry (* current_retry_count)") \`
`437`	`437`	`range(0, max_intx) \`
`438`	`438`	`\`
`439`		`- product(bool, AssertOnSuspendWaitFailure, false, \`
`440`		`- "Assert/Guarantee on external suspend wait failure") \`
`441`		`- \`
`442`		`- product(bool, TraceSuspendWaitFailures, false, \`
`443`		`- "Trace external suspend wait failures") \`
`444`		`- \`
`445`	`439`	`product(bool, MaxFDLimit, true, \`
`446`	`440`	`"Bump the number of file descriptors to maximum (Unix only)") \`
`447`	`441`	`\`