test/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForSupportedCPU.java

*** 55,64 ****
--- 55,65 ----
          // Verify that there will be no warnings when +UseSHA was passed and
          // all UseSHA*Intrinsics options were disabled.
          CommandLineOptionTest.verifySameJVMStartup(
                  null, new String[] { ".*UseSHA.*" }, shouldPassMessage,
                  shouldPassMessage, ExitCode.OK,
+                 SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS,
                  CommandLineOptionTest.prepareBooleanFlag(
                          SHAOptionsBase.USE_SHA_OPTION, true),
                  CommandLineOptionTest.prepareBooleanFlag(
                          SHAOptionsBase.USE_SHA1_INTRINSICS_OPTION, false),
                  CommandLineOptionTest.prepareBooleanFlag(
*** 73,82 ****
--- 74,84 ----
          // disabled.
          CommandLineOptionTest.verifyOptionValueForSameVM(
                  SHAOptionsBase.USE_SHA_OPTION, "false", String.format(
                  "'%s' option should be disabled when all UseSHA*Intrinsics are"
                          + " disabled", SHAOptionsBase.USE_SHA_OPTION),
+                 SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS,
                  CommandLineOptionTest.prepareBooleanFlag(
                          SHAOptionsBase.USE_SHA1_INTRINSICS_OPTION, false),
                  CommandLineOptionTest.prepareBooleanFlag(
                          SHAOptionsBase.USE_SHA256_INTRINSICS_OPTION, false),
                  CommandLineOptionTest.prepareBooleanFlag(
*** 89,98 ****
--- 91,101 ----
                  String.format("'%s' option should be disabled when all "
                          + "UseSHA*Intrinsics are disabled even if %s flag set "
                          + "to JVM", SHAOptionsBase.USE_SHA_OPTION,
                          CommandLineOptionTest.prepareBooleanFlag(
                               SHAOptionsBase.USE_SHA_OPTION, true)),
+                 SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS,
                  CommandLineOptionTest.prepareBooleanFlag(
                          SHAOptionsBase.USE_SHA_OPTION, true),
                  CommandLineOptionTest.prepareBooleanFlag(
                          SHAOptionsBase.USE_SHA1_INTRINSICS_OPTION, false),
                  CommandLineOptionTest.prepareBooleanFlag(
*** 107,116 ****
--- 110,120 ----
                  String.format("'%s' option should be disabled if %s flag "
                          + "set even if all UseSHA*Intrinsics were enabled",
                          SHAOptionsBase.USE_SHA_OPTION,
                          CommandLineOptionTest.prepareBooleanFlag(
                              SHAOptionsBase.USE_SHA_OPTION, false)),
+                 SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS,
                  CommandLineOptionTest.prepareBooleanFlag(
                          SHAOptionsBase.USE_SHA_OPTION, false),
                  CommandLineOptionTest.prepareBooleanFlag(
                          SHAOptionsBase.USE_SHA1_INTRINSICS_OPTION, true),
                  CommandLineOptionTest.prepareBooleanFlag(