Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
386150d
Rename jtreg property vm.libgraal.enabled to vm.libgraal.jit.
toddjonker Sep 25, 2024
59a8ed3
Rename Compiler.isLibgraalEnabled to isLibgraalJIT
toddjonker Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/hotspot/jtreg/TEST.ROOT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
7 changes: 3 additions & 4 deletions test/jtreg-ext/requires/VMProps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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();
}

/**
Expand Down
4 changes: 2 additions & 2 deletions test/lib/jdk/test/whitebox/code/Compiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down