From 2349bb7ace0c40c0f19dee81b4a86bed0e855043 Mon Sep 17 00:00:00 2001
From: "Todd V. Jonker" <jonker@amazon.com>
Date: Thu, 26 Sep 2024 21:38:08 +0000
Subject: [PATCH] 8340974: Ambiguous name of jtreg property vm.libgraal.enabled

Reviewed-by: dnsimon, phh
---
 test/hotspot/jtreg/TEST.ROOT                  | 2 +-
 test/jtreg-ext/requires/VMProps.java          | 7 +++----
 test/lib/jdk/test/whitebox/code/Compiler.java | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/test/hotspot/jtreg/TEST.ROOT b/test/hotspot/jtreg/TEST.ROOT
index 74540b6ad45..5ed0227068c 100644
--- a/test/hotspot/jtreg/TEST.ROOT
+++ b/test/hotspot/jtreg/TEST.ROOT
@@ -81,7 +81,7 @@ requires.properties= \
     vm.jvmti \
     vm.graal.enabled \
     jdk.hasLibgraal \
-    vm.libgraal.enabled \
+    vm.libgraal.jit \
     vm.compiler1.enabled \
     vm.compiler2.enabled \
     vm.musl \
diff --git a/test/jtreg-ext/requires/VMProps.java b/test/jtreg-ext/requires/VMProps.java
index 5aa703c5b26..539a1f23208 100644
--- a/test/jtreg-ext/requires/VMProps.java
+++ b/test/jtreg-ext/requires/VMProps.java
@@ -128,8 +128,7 @@ public class VMProps implements Callable<Map<String, String>> {
         map.put("vm.graal.enabled", this::isGraalEnabled);
         // jdk.hasLibgraal is true if the libgraal shared library file is present
         map.put("jdk.hasLibgraal", this::hasLibgraal);
-        // vm.libgraal.enabled is true if libgraal is used as JIT
-        map.put("vm.libgraal.enabled", this::isLibgraalEnabled);
+        map.put("vm.libgraal.jit", this::isLibgraalJIT);
         map.put("vm.compiler1.enabled", this::isCompiler1Enabled);
         map.put("vm.compiler2.enabled", this::isCompiler2Enabled);
         map.put("docker.support", this::dockerSupport);
@@ -560,8 +559,8 @@ public class VMProps implements Callable<Map<String, String>> {
      *
      * @return true if libgraal is used as JIT compiler.
      */
-    protected String isLibgraalEnabled() {
-        return "" + Compiler.isLibgraalEnabled();
+    protected String isLibgraalJIT() {
+        return "" + Compiler.isLibgraalJIT();
     }
 
     /**
diff --git a/test/lib/jdk/test/whitebox/code/Compiler.java b/test/lib/jdk/test/whitebox/code/Compiler.java
index 2f8447700d5..69d79ab9d71 100644
--- a/test/lib/jdk/test/whitebox/code/Compiler.java
+++ b/test/lib/jdk/test/whitebox/code/Compiler.java
@@ -91,12 +91,12 @@ public class Compiler {
     /**
      * Check if libgraal is used as JIT compiler.
      *
-     * libraal is enabled if isGraalEnabled is true and:
+     * libraal JIT is enabled if isGraalEnabled is true and:
      * - UseJVMCINativeLibrary flag is true
      *
      * @return true if libgraal is used as JIT compiler.
      */
-    public static boolean isLibgraalEnabled() {
+    public static boolean isLibgraalJIT() {
         if (!isGraalEnabled()) {
             return false;
         }