# HG changeset patch
# User shade
# Date 1582708653 -3600
#      Wed Feb 26 10:17:33 2020 +0100
# Node ID e2bc71c63c416e4672661f41b0da07f158fd791f
# Parent  695c6b0986c390485cfbc9277b96bac49ebc5e34
8240069: Shenandoah: turn more flags diagnostic
Reviewed-by: XXX

diff --git a/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp b/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
--- a/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
@@ -337,7 +337,7 @@
   experimental(uint, ShenandoahParallelSafepointThreads, 4,                 \
           "Number of parallel threads used for safepoint prolog/epilog")    \
                                                                             \
-  experimental(bool, ShenandoahPreclean, true,                              \
+  diagnostic(bool, ShenandoahPreclean, true,                                \
           "Do concurrent preclean phase before final mark: process "        \
           "definitely alive references to avoid dealing with them during "  \
           "pause.")                                                         \
@@ -363,10 +363,10 @@
   diagnostic(bool, ShenandoahLoadRefBarrier, true,                          \
           "Turn on/off load-reference barriers in Shenandoah")              \
                                                                             \
-  experimental(bool, ShenandoahConcurrentScanCodeRoots, true,               \
+  diagnostic(bool, ShenandoahConcurrentScanCodeRoots, true,                 \
           "Scan code roots concurrently, instead of during a pause")        \
                                                                             \
-  experimental(uintx, ShenandoahCodeRootsStyle, 2,                          \
+  diagnostic(uintx, ShenandoahCodeRootsStyle, 2,                            \
           "Use this style to scan code cache:"                              \
           " 0 - sequential iterator;"                                       \
           " 1 - parallel iterator;"                                         \
@@ -383,7 +383,7 @@
   develop(bool, ShenandoahVerifyOptoBarriers, false,                        \
           "Verify no missing barriers in C2")                               \
                                                                             \
-  experimental(bool, ShenandoahLoopOptsAfterExpansion, true,                \
+  diagnostic(bool, ShenandoahLoopOptsAfterExpansion, true,                  \
           "Attempt more loop opts after barrier expansion")                 \
                                                                             \
   diagnostic(bool, ShenandoahSelfFixing, true,                              \
diff --git a/test/hotspot/jtreg/gc/shenandoah/options/TestCodeCacheRootStyles.java b/test/hotspot/jtreg/gc/shenandoah/options/TestCodeCacheRootStyles.java
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestCodeCacheRootStyles.java
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestCodeCacheRootStyles.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2017, 2020, Red Hat, Inc. 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
@@ -25,9 +25,12 @@
 /* @test TestCodeCacheRootStyles
  * @key gc
  * @requires vm.gc.Shenandoah & !vm.graal.enabled
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahCodeRootsStyle=0 TestCodeCacheRootStyles
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahCodeRootsStyle=1 TestCodeCacheRootStyles
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahCodeRootsStyle=2 TestCodeCacheRootStyles
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+UseShenandoahGC -XX:ShenandoahCodeRootsStyle=0 TestCodeCacheRootStyles
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+UseShenandoahGC -XX:ShenandoahCodeRootsStyle=1 TestCodeCacheRootStyles
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+UseShenandoahGC -XX:ShenandoahCodeRootsStyle=2 TestCodeCacheRootStyles
  */
 
 public class TestCodeCacheRootStyles {