Update XX flag requirement

kevinjwalls · Apr 8, 2024 · 44fc23d · 44fc23d
1 parent 17f22d6
commit 44fc23d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
@@ -170,6 +170,9 @@ const int ObjectAlignmentInBytes = 8;
   product(bool, AlwaysSafeConstructors, false, EXPERIMENTAL,                \
           "Force safe construction, as if all fields are final.")           \
                                                                             \
+  product(bool, UnlockDiagnosticVMFeatures, trueInDebug,                    \
+          "Enable VM features relating to field diagnostics")               \
+                                                                            \
   product(bool, UnlockDiagnosticVMOptions, trueInDebug, DIAGNOSTIC,         \
           "Enable normal processing of flags relating to field diagnostics")\
                                                                             \

diff --git a/src/hotspot/share/services/diagnosticCommand.cpp b/src/hotspot/share/services/diagnosticCommand.cpp
@@ -1251,8 +1251,8 @@ VMInspectDCmd::VMInspectDCmd(outputStream* output, bool heap) :
 void VMInspectDCmd::execute(DCmdSource source, TRAPS) {
   DebuggingContext dc{}; // avoid asserts
 
-  if (!UnlockDiagnosticVMOptions) {
-    output()->print_cr("-XX:+UnlockDiagnosticVMOptions is required");
+  if (!UnlockDiagnosticVMFeatures) {
+    output()->print_cr("-XX:+UnlockDiagnosticVMFeatures is required");
     return;
   }
   if (!_address.has_value()) {

diff --git a/test/hotspot/jtreg/serviceability/dcmd/vm/VMInspectTest.java b/test/hotspot/jtreg/serviceability/dcmd/vm/VMInspectTest.java
@@ -27,7 +27,7 @@
  * @summary Test of diagnostic command VM.inspect
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
- * @run testng/othervm -Dvminspect.enabled=true -XX:+UnlockDiagnosticVMOptions VMInspectTest
+ * @run testng/othervm -Dvminspect.enabled=true -XX:+UnlockDiagnosticVMFeatures VMInspectTest
  */
 
 /*
@@ -81,14 +81,14 @@ public void run(CommandExecutor executor) throws ClassNotFoundException {
         BigInteger ptr = null;
         OutputAnalyzer output = null;
 
-        // Testing VM.inspect requires UnlockDiagnosticVMOptions or a debug JVM.
-        // This test runs with a System Property set as a hint whether UnlockDiagnosticVMOptions is set.
+        // Testing VM.inspect requires UnlockDiagnosticVMFeatures or a debug JVM.
+        // This test runs with a System Property set as a hint whether UnlockDiagnosticVMFeatures is set.
         boolean enabled = Platform.isDebugBuild() || Boolean.getBoolean("vminspect.enabled");
         System.out.println("VM.inspect should be enabled = " + enabled);
         if (!enabled) {
             // Use any pointer, command should be refused:
             output = executor.execute("VM.inspect 0x0");
-            output.shouldContain("-XX:+UnlockDiagnosticVMOptions is required");
+            output.shouldContain("-XX:+UnlockDiagnosticVMFeatures is required");
             return; // no more testing
         }