8340974: Ambiguous name of jtreg property vm.libgraal.enabled

Reviewed-by: dnsimon, phh
openjdk · Sep 26, 2024 · 2349bb7 · 2349bb7 · openjdk-notifier · Sep 26, 2024
1 parent 5d062e2
commit 2349bb7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git 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
@@ -128,8 +128,7 @@ public Map<String, String> call() {
         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 @@ protected String hasLibgraal() {
      *
      * @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
@@ -91,12 +91,12 @@ public static boolean isGraalEnabled() {
     /**
      * 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;
         }