Skip to content

Commit 2349bb7

Browse files
toddjonkerPaul Hohensee
authored and
Paul Hohensee
committedSep 26, 2024
8340974: Ambiguous name of jtreg property vm.libgraal.enabled
Reviewed-by: dnsimon, phh
1 parent 5d062e2 commit 2349bb7

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed
 

‎test/hotspot/jtreg/TEST.ROOT

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ requires.properties= \
8181
vm.jvmti \
8282
vm.graal.enabled \
8383
jdk.hasLibgraal \
84-
vm.libgraal.enabled \
84+
vm.libgraal.jit \
8585
vm.compiler1.enabled \
8686
vm.compiler2.enabled \
8787
vm.musl \

‎test/jtreg-ext/requires/VMProps.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,7 @@ public Map<String, String> call() {
128128
map.put("vm.graal.enabled", this::isGraalEnabled);
129129
// jdk.hasLibgraal is true if the libgraal shared library file is present
130130
map.put("jdk.hasLibgraal", this::hasLibgraal);
131-
// vm.libgraal.enabled is true if libgraal is used as JIT
132-
map.put("vm.libgraal.enabled", this::isLibgraalEnabled);
131+
map.put("vm.libgraal.jit", this::isLibgraalJIT);
133132
map.put("vm.compiler1.enabled", this::isCompiler1Enabled);
134133
map.put("vm.compiler2.enabled", this::isCompiler2Enabled);
135134
map.put("docker.support", this::dockerSupport);
@@ -560,8 +559,8 @@ protected String hasLibgraal() {
560559
*
561560
* @return true if libgraal is used as JIT compiler.
562561
*/
563-
protected String isLibgraalEnabled() {
564-
return "" + Compiler.isLibgraalEnabled();
562+
protected String isLibgraalJIT() {
563+
return "" + Compiler.isLibgraalJIT();
565564
}
566565

567566
/**

‎test/lib/jdk/test/whitebox/code/Compiler.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,12 @@ public static boolean isGraalEnabled() {
9191
/**
9292
* Check if libgraal is used as JIT compiler.
9393
*
94-
* libraal is enabled if isGraalEnabled is true and:
94+
* libraal JIT is enabled if isGraalEnabled is true and:
9595
* - UseJVMCINativeLibrary flag is true
9696
*
9797
* @return true if libgraal is used as JIT compiler.
9898
*/
99-
public static boolean isLibgraalEnabled() {
99+
public static boolean isLibgraalJIT() {
100100
if (!isGraalEnabled()) {
101101
return false;
102102
}

0 commit comments

Comments
 (0)
Please sign in to comment.