changeset 59997:6e6e6635a970

8248265: compiler/ciReplay tests fail with AOT compiled java.base Summary: The test should use a non-empty method to trigger compilation. Reviewed-by: kvn, neliasso, iignatyev
author thartmann
date Tue, 30 Jun 2020 15:08:40 +0200
parents dc7dd368849b
children 95946afeaad1
files test/hotspot/jtreg/ProblemList-aot.txt test/hotspot/jtreg/compiler/ciReplay/CiReplayBase.java
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/test/hotspot/jtreg/ProblemList-aot.txt	Mon Jun 29 10:15:45 2020 -0400
+++ b/test/hotspot/jtreg/ProblemList-aot.txt	Tue Jun 30 15:08:40 2020 +0200
@@ -85,8 +85,5 @@
 compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java    8167430 generic-all
 compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java  8167430 generic-all
 
-compiler/ciReplay/TestServerVM.java      8248265 generic-all
-compiler/ciReplay/TestVMNoCompLevel.java 8248265 generic-all
-
 vmTestbase/vm/mlvm/indy/stress/java/relinkMutableCallSiteFreq/Test.java   8226689 generic-all
 vmTestbase/vm/mlvm/indy/stress/java/relinkVolatileCallSiteFreq/Test.java  8226689 generic-all
--- a/test/hotspot/jtreg/compiler/ciReplay/CiReplayBase.java	Mon Jun 29 10:15:45 2020 -0400
+++ b/test/hotspot/jtreg/compiler/ciReplay/CiReplayBase.java	Tue Jun 30 15:08:40 2020 +0200
@@ -70,9 +70,12 @@
     private static final String[] REPLAY_OPTIONS = new String[]{DISABLE_COREDUMP_ON_CRASH,
         "-XX:+ReplayCompiles", REPLAY_FILE_OPTION};
     protected final Optional<Boolean> runServer;
+    private static int dummy;
 
-    public static class EmptyMain {
+    public static class TestMain {
         public static void main(String[] args) {
+            // Do something because empty methods might not be called/compiled.
+            dummy = 42;
         }
     }
 
@@ -140,7 +143,7 @@
             options.addAll(Arrays.asList(REPLAY_GENERATION_OPTIONS));
             options.addAll(Arrays.asList(vmopts));
             options.add(needCoreDump ? ENABLE_COREDUMP_ON_CRASH : DISABLE_COREDUMP_ON_CRASH);
-            options.add(EmptyMain.class.getName());
+            options.add(TestMain.class.getName());
             if (needCoreDump) {
                 crashOut = ProcessTools.executeProcess(getTestJvmCommandlineWithPrefix(
                         RUN_SHELL_NO_LIMIT, options.toArray(new String[0])));