Skip to content

Commit 4f23fc1

Browse files
Yudi ZhengDoug Simon
Yudi Zheng
authored and
Doug Simon
committedJun 13, 2023
8309671: Avoid using jvmci.Compiler property to determine if Graal is enabled
Reviewed-by: dnsimon, sspitsyn
1 parent 1a9edb8 commit 4f23fc1

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed
 

‎test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitor.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,9 @@ private static boolean getCheckLines() {
252252

253253
VMOption enableJVMCI = bean.getVMOption("EnableJVMCI");
254254
VMOption useJVMCICompiler = bean.getVMOption("UseJVMCICompiler");
255-
String compiler = System.getProperty("jvmci.Compiler");
256255

257256
checkLines = !(enableJVMCI.getValue().equals("true")
258-
&& useJVMCICompiler.getValue().equals("true") && compiler.equals("graal"));
257+
&& useJVMCICompiler.getValue().equals("true"));
259258
} catch (Exception e) {
260259
// NOP.
261260
}

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

-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ public static boolean isJVMCIEnabled() {
6363
* Graal is enabled if following conditions are true:
6464
* - we are not in Interpreter mode
6565
* - UseJVMCICompiler flag is true
66-
* - jvmci.Compiler variable is equal to 'graal'
6766
* - TieredCompilation is not used or TieredStopAtLevel is greater than 3
6867
* No need to check client mode because it set UseJVMCICompiler to false.
6968
*

0 commit comments

Comments
 (0)
Please sign in to comment.