Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
8248265: compiler/ciReplay tests fail with AOT compiled java.base
The test should use a non-empty method to trigger compilation.

Reviewed-by: kvn, neliasso, iignatyev
  • Loading branch information
TobiHartmann committed Jun 30, 2020
1 parent a7e352b commit d5ae932b3fb80fb96b808db1cead20adea8dfb00
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
@@ -85,8 +85,5 @@ compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java 8167430 gene
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
@@ -70,9 +70,12 @@ public abstract class CiReplayBase {
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 @@ public boolean generateReplay(boolean needCoreDump, String... vmopts) {
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])));

0 comments on commit d5ae932

Please sign in to comment.