From 04aea0b8ef3fe20fdb63204b26e36bd937525c2c Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jkratochvil@openjdk.org>
Date: Thu, 7 Nov 2024 21:01:38 +0800
Subject: [PATCH] Print RESTORE_SETTABLE marker

---
 src/hotspot/share/runtime/flags/jvmFlag.cpp   |  1 +
 .../crac/CracRestoreSettablePrintFlags.java   | 40 +++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 test/jdk/jdk/crac/CracRestoreSettablePrintFlags.java

diff --git a/src/hotspot/share/runtime/flags/jvmFlag.cpp b/src/hotspot/share/runtime/flags/jvmFlag.cpp
index 6d4500f6e9a..a4e01d0a87c 100644
--- a/src/hotspot/share/runtime/flags/jvmFlag.cpp
+++ b/src/hotspot/share/runtime/flags/jvmFlag.cpp
@@ -340,6 +340,7 @@ void JVMFlag::print_kind(outputStream* st, unsigned int width) const {
     { KIND_C1, "C1" },
     { KIND_C2, "C2" },
     { KIND_ARCH, "ARCH" },
+    { KIND_RESTORE_SETTABLE, "restore" },
     { KIND_PLATFORM_DEPENDENT, "pd" },
     { KIND_PRODUCT, "product" },
     { KIND_MANAGEABLE, "manageable" },
diff --git a/test/jdk/jdk/crac/CracRestoreSettablePrintFlags.java b/test/jdk/jdk/crac/CracRestoreSettablePrintFlags.java
new file mode 100644
index 00000000000..3fc442f022f
--- /dev/null
+++ b/test/jdk/jdk/crac/CracRestoreSettablePrintFlags.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2024, Azul Systems, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+ import jdk.test.lib.process.OutputAnalyzer;
+ import jdk.test.lib.process.ProcessTools;
+
+/*
+ * @test
+ * @library /test/lib
+ * @run main CracRestoreSettablePrintFlags
+ */
+public class CracRestoreSettablePrintFlags {
+    public static void main(String[] args) throws Exception {
+        ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
+            "-XX:+PrintFlagsFinal",
+            "-version");
+        OutputAnalyzer out = new OutputAnalyzer(pb.start());
+        out.shouldMatch("RestoreFrom *= *\\{restore product\\}");
+    }
+}