stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Reviewed-by: dnsimon, phh
This commit is contained in:
Todd V. Jonker 2024-09-26 21:38:08 +00:00 committed by Paul Hohensee
parent 5d062e248e
commit 2349bb7ace
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/hotspot/jtreg/TEST.ROOT
View File

@ -81,7 +81,7 @@ requires.properties= \
vm.jvmti \ vm.jvmti \
vm.graal.enabled \ vm.graal.enabled \
jdk.hasLibgraal \ jdk.hasLibgraal \
vm.libgraal.enabled \ vm.libgraal.jit \
vm.compiler1.enabled \ vm.compiler1.enabled \
vm.compiler2.enabled \ vm.compiler2.enabled \
vm.musl \ vm.musl \

7
test/jtreg-ext/requires/VMProps.java
View File

@ -128,8 +128,7 @@ public class VMProps implements Callable<Map<String, String>> {
map.put("vm.graal.enabled", this::isGraalEnabled); map.put("vm.graal.enabled", this::isGraalEnabled);
// jdk.hasLibgraal is true if the libgraal shared library file is present // jdk.hasLibgraal is true if the libgraal shared library file is present
map.put("jdk.hasLibgraal", this::hasLibgraal); map.put("jdk.hasLibgraal", this::hasLibgraal);
// vm.libgraal.enabled is true if libgraal is used as JIT map.put("vm.libgraal.jit", this::isLibgraalJIT);
map.put("vm.libgraal.enabled", this::isLibgraalEnabled);
map.put("vm.compiler1.enabled", this::isCompiler1Enabled); map.put("vm.compiler1.enabled", this::isCompiler1Enabled);
map.put("vm.compiler2.enabled", this::isCompiler2Enabled); map.put("vm.compiler2.enabled", this::isCompiler2Enabled);
map.put("docker.support", this::dockerSupport); 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. * @return true if libgraal is used as JIT compiler.
*/ */
protected String isLibgraalEnabled() { protected String isLibgraalJIT() {
return "" + Compiler.isLibgraalEnabled(); return "" + Compiler.isLibgraalJIT();
} }
/** /**

4
test/lib/jdk/test/whitebox/code/Compiler.java
View File

@ -91,12 +91,12 @@ public class Compiler {
/** /**
* Check if libgraal is used as JIT 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 * - UseJVMCINativeLibrary flag is true
* *
* @return true if libgraal is used as JIT compiler. * @return true if libgraal is used as JIT compiler.
*/ */
public static boolean isLibgraalEnabled() { public static boolean isLibgraalJIT() {
if (!isGraalEnabled()) { if (!isGraalEnabled()) {
return false; return false;
} }