8351100: [leyden] -XX:AOTEndTrainingOnMethodEntry crashes with large count

iklam · iklam · commit bbac8f2d845a · 2025-03-06T17:38:03.000-08:00
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -884,8 +884,10 @@ void MetaspaceShared::preload_and_dump(TRAPS) {
 
   if (CDSConfig::new_aot_flags_used()) {
     if (CDSConfig::is_dumping_preimage_static_archive()) {
+      // We are in the JVM that runs the training run. Continue execution,
+      // so that it can finish all clean-up and return the correct exit
+      // code to the OS.
       tty->print_cr("AOTConfiguration recorded: %s", AOTConfiguration);
-      vm_exit(0);
     } else {
       // The JLI launcher only recognizes the "old" -Xshare:dump flag.
       // When the new -XX:AOTMode=create flag is used, we can't return
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/TrainingRun.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/TrainingRun.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * @test
+ * @summary -XX:AOTMode=record should not interfere with app execution: (1) thread creation; (2) exit code
+ * @requires vm.cds.supports.aot.class.linking
+ * @comment work around JDK-8345635
+ * @requires !vm.jvmci.enabled
+ * @library /test/jdk/lib/testlibrary /test/lib
+ * @build TrainingRun
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar MyTestApp
+ * @run driver TrainingRun AOT
+ */
+
+import jdk.test.lib.cds.CDSAppTester;
+import jdk.test.lib.helpers.ClassFileInstaller;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class TrainingRun {
+    static final String appJar = ClassFileInstaller.getJarPath("app.jar");
+    static final String mainClass = "MyTestApp";
+
+    public static void main(String[] args) throws Exception {
+        (new Tester()).run(args);
+    }
+
+    static class Tester extends CDSAppTester {
+        public Tester() {
+            super(mainClass);
+
+            // CDSAppTester usually wants the app to return exit value 0, but this test
+            // checks whether the training run can return 2.
+            setCheckExitValue(false);
+        }
+
+        @Override
+        public String classpath(RunMode runMode) {
+            return appJar;
+        }
+
+        @Override
+        public String[] appCommandLine(RunMode runMode) {
+            return new String[] {
+                mainClass,
+            };
+        }
+
+        @Override
+        public void checkExecution(OutputAnalyzer out, RunMode runMode) {
+            if (runMode.isApplicationExecuted()) {
+                out.shouldHaveExitValue(2);
+                out.shouldContain("Hello: x is 1");
+            }
+        }
+    }
+}
+
+class MyTestApp {
+    volatile static int x = 0;
+
+    public static void main(String args[]) throws Exception {
+        Thread t = new Thread(() -> {
+                x = 1;
+        });
+        t.start();
+        t.join();
+
+        if (x != 1) {
+            throw new RuntimeException("x should be 1 but is " + x);
+        }
+        System.out.println("Hello: x is " + x);
+        System.out.println("I am calling System.exit(2)");
+        System.exit(2);
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/leyden/EndTrainingOnMethodEntry.java b/test/hotspot/jtreg/runtime/cds/appcds/leyden/EndTrainingOnMethodEntry.java
@@ -24,7 +24,9 @@
 
 /*
  * @test id=aot
- * @requires vm.cds.write.archived.java.heap
+ * @requires vm.cds.supports.aot.class.linking
+ * @comment work around JDK-8345635
+ * @requires !vm.jvmci.enabled
  * @library /test/jdk/lib/testlibrary /test/lib
  * @build EndTrainingOnMethodEntry
  * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar MyTestApp ShouldBeCached ShouldNotBeCached
@@ -33,7 +35,9 @@
 
 /*
  * @test id=leyden
- * @requires vm.cds.write.archived.java.heap
+ * @requires vm.cds.supports.aot.class.linking
+ * @comment work around JDK-8345635
+ * @requires !vm.jvmci.enabled
  * @library /test/jdk/lib/testlibrary /test/lib
  * @build EndTrainingOnMethodEntry
  * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar MyTestApp ShouldBeCached ShouldNotBeCached
@@ -49,16 +53,18 @@ public class EndTrainingOnMethodEntry {
     static final String mainClass = "MyTestApp";
 
     public static void main(String[] args) throws Exception {
-        (new Tester(false)).run(args);
-        (new Tester(true)).run(args);
+        // We want to test the entry count implementation in both interpreter and compiler.
+        (new Tester(1)).run(args);
+        (new Tester(10)).run(args);    // the loop will probably be interpreted
+        (new Tester(10000)).run(args); // the loop will probably be compiled.
     }
 
     static class Tester extends CDSAppTester {
-        boolean useCount;
+        int count;
 
-        public Tester(boolean useCount) {
+        public Tester(int count) {
             super(mainClass);
-            this.useCount = useCount;
+            this.count = count;
         }
 
         @Override
@@ -67,7 +73,7 @@ public String classpath(RunMode runMode) {
         }
 
         public String[] vmArgs(RunMode runMode) {
-            String stop = useCount ? ("stopTrainingOnMeWithCount,count=" + MyTestApp.COUNT) : "stopTrainingOnMe";
+            String stop = count > 1 ? ("stopTrainingOnMeWithCount,count=" + count) : "stopTrainingOnMe";
             return new String[] {
                 "-Xlog:cds+class=debug",
                 "-XX:AOTEndTrainingOnMethodEntry=MyTestApp." + stop,
@@ -77,14 +83,16 @@ public String[] vmArgs(RunMode runMode) {
         @Override
         public String[] appCommandLine(RunMode runMode) {
             return new String[] {
-                mainClass, runMode.name(), Boolean.toString(useCount),
+                mainClass, runMode.name(), Integer.toString(count),
             };
         }
 
         @Override
         public void checkExecution(OutputAnalyzer out, RunMode runMode) {
             if (runMode.isApplicationExecuted()) {
                 out.shouldContain("Hello Leyden " + runMode.name());
+                out.shouldContain("ShouldBeCached.dummy()");
+                out.shouldContain("ShouldNotBeCached.dummy()");
             }
             if (isDumping(runMode)) {
                 out.shouldMatch("cds,class.* ShouldBeCached");
@@ -95,11 +103,13 @@ public void checkExecution(OutputAnalyzer out, RunMode runMode) {
 }
 
 class MyTestApp {
-    public static final int COUNT = 10; // FIXME (JDK-8351100): debug build crashes with COUNT = 10000;
-    public static void main(String args[]) {
-        System.out.println("Hello Leyden " + args[0] + ", useCount = " + args[1]);
-        if (args[1].equals("true")) {
-            for (int i = 0; i < COUNT + 10; i++) {
+    public static int COUNT;
+    public static void main(String args[]) throws Exception {
+        System.out.println("Hello Leyden " + args[0] + ", count = " + args[1]);
+        COUNT = Integer.parseInt(args[1]);
+        if (COUNT > 1) {
+            int max = COUNT + 10;
+            for (int i = 0; i < max; i++) {
                 stopTrainingOnMeWithCount(i);
             }
         } else {
@@ -117,7 +127,6 @@ static void stopTrainingOnMe() {
 
     static void stopTrainingOnMeWithCount(int i) {
         if (i >= COUNT - 2) {
-            System.out.println("COUNT = " + COUNT + ", i = " + i);
             ShouldBeCached.dummy();
         }
         if (i >= COUNT) {
