8344718: Test runtime/cds/appcds/jigsaw/addmods/AddmodsOption.java fa…

…ils on Linuxppc64le after JDK-8344239 Reviewed-by: ccheung, mdoerr
openjdk · Nov 22, 2024 · 8903854 · 8903854 · openjdk-notifier · Nov 22, 2024
1 parent a07b72b
commit 8903854
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/addmods/AddmodsOption.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/addmods/AddmodsOption.java
@@ -34,13 +34,10 @@
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.whitebox.WhiteBox;
+import jdk.test.whitebox.code.Compiler;
 
 public class AddmodsOption {
 
-    private static final WhiteBox WB = WhiteBox.getWhiteBox();
-    private static final boolean isJVMCISupported = WB.getBooleanVMFlag("EnableJVMCI");
-
     public static void main(String[] args) throws Exception {
         final String moduleOption = "jdk.httpserver/sun.net.httpserver.simpleserver.Main";
         final String incubatorModule = "jdk.incubator.vector";
@@ -143,7 +140,7 @@ public static void main(String[] args) throws Exception {
           .shouldContain("subgraph jdk.internal.module.ArchivedBootLayer is not recorde")
           .shouldHaveExitValue(0);
 
-        if (isJVMCISupported) {
+        if (Compiler.isJVMCIEnabled()) {
             // dump an archive with JVMCI option which indirectly adds the
             // jdk.internal.vm.ci module using the --add-modules option
             archiveName = TestCommon.getNewArchiveName("jvmci-module");