8257726: Make -XX:+StressLdcRewrite option a diagnostic option

Reviewed-by: lfoltan, stuefe, dcubed
openjdk · Dec 15, 2020 · 4d6f318 · 4d6f318 · openjdk-notifier · Dec 15, 2020
1 parent 8bf46c7
commit 4d6f318
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
@@ -881,11 +881,11 @@ const intx ObjectAlignmentInBytes = 8;
   product(ccstr, TraceJVMTI, NULL,                                          \
           "Trace flags for JVMTI functions and events")                     \
                                                                             \
-  /* This option can change an EMCP method into an obsolete method. */      \
-  /* This can affect tests that except specific methods to be EMCP. */      \
-  /* This option should be used with caution.                       */      \
-  product(bool, StressLdcRewrite, false,                                    \
-          "Force ldc -> ldc_w rewrite during RedefineClasses")              \
+  product(bool, StressLdcRewrite, false, DIAGNOSTIC,                        \
+          "Force ldc -> ldc_w rewrite during RedefineClasses. "             \
+          "This option can change an EMCP method into an obsolete method "  \
+          "and can affect tests that expect specific methods to be EMCP. "  \
+          "This option should be used with caution.")                       \
                                                                             \
   product(bool, AllowRedefinitionToAddDeleteMethods, false,                 \
           "(Deprecated) Allow redefinition to add and delete private "      \

diff --git a/test/jdk/java/lang/instrument/RedefineMethodWithAnnotations.sh b/test/jdk/java/lang/instrument/RedefineMethodWithAnnotations.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ cp "${TESTSRC}"/RedefineMethodWithAnnotationsAnnotations.java \
     RedefineMethodWithAnnotationsAnnotations.java
 
 "${JAVA}" ${TESTVMOPTS} -javaagent:RedefineMethodWithAnnotationsAgent.jar \
-    -XX:+StressLdcRewrite -XX:+IgnoreUnrecognizedVMOptions \
+    -XX:+UnlockDiagnosticVMOptions -XX:+StressLdcRewrite -XX:+IgnoreUnrecognizedVMOptions \
     -cp "${TESTCLASSES}" RedefineMethodWithAnnotationsApp > output.log 2>&1
 cat output.log