8350982: -server|-client causes fatal exception on static JDK

Reviewed-by: iklam, alanb
2025-03-12 17:20:16 +00:00 · 2025-03-12 17:20:16 +00:00 · 02c850fca8
commit 02c850fca8
parent 2371696781
14 changed files with 14 additions and 17 deletions
--- a/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndHeapDump.java
+++ b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndHeapDump.java
@ -26,6 +26,7 @@
 * @bug 8319784
 * @summary Check that the JVM is able to dump the heap even when there are ReduceAllocationMerge in the scope.
 * @library /test/lib /
+ * @requires vm.flavor == "server" & !vm.emulatedClient
 * @run main/othervm compiler.c2.TestReduceAllocationAndHeapDump
 */

@ -45,7 +46,6 @@ public class TestReduceAllocationAndHeapDump {
            }

            String[] dumperArgs = {
-                "-server",
                "-XX:CompileThresholdScaling=0.01",
                "-XX:+HeapDumpAfterFullGC",
                "-XX:HeapDumpPath=" + dumpDirectory.getAbsolutePath(),
--- a/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndLoadKlass.java
+++ b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndLoadKlass.java
@ -36,7 +36,6 @@
 *                   -XX:-UseCompressedClassPointers
 *                   -Xbatch
 *                   -Xcomp
- *                   -server
 *                   compiler.c2.TestReduceAllocationAndLoadKlass
 */

--- a/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNonExactAllocate.java
+++ b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNonExactAllocate.java
@ -36,7 +36,6 @@
 *                   -XX:-TieredCompilation
 *                   -Xbatch
 *                   -Xcomp
- *                   -server
 *                   compiler.c2.TestReduceAllocationAndNonExactAllocate
 */

--- a/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNullableLoads.java
+++ b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNullableLoads.java
@ -30,7 +30,7 @@
 * @compile -XDstringConcat=inline TestReduceAllocationAndNullableLoads.java
 * @run main/othervm -XX:CompileCommand=compileonly,*TestReduceAllocationAndNullableLoads*::*
 *                   -XX:CompileCommand=dontinline,*TestReduceAllocationAndNullableLoads*::*
- *                   -XX:-TieredCompilation -Xcomp -server
+ *                   -XX:-TieredCompilation -Xcomp
 *                   compiler.c2.TestReduceAllocationAndNullableLoads
 */

--- a/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndPointerComparisons.java
+++ b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndPointerComparisons.java
@ -28,7 +28,7 @@
 * @requires vm.flagless & vm.compiler2.enabled & vm.opt.final.EliminateAllocations
 * @run main/othervm -XX:CompileCommand=compileonly,*TestReduceAllocationAndPointerComparisons*::*
 *                   -XX:CompileCommand=dontinline,*TestReduceAllocationAndPointerComparisons*::*
- *                   -XX:-TieredCompilation -Xcomp -server
+ *                   -XX:-TieredCompilation -Xcomp
 *                   compiler.c2.TestReduceAllocationAndPointerComparisons
 * @run main compiler.c2.TestReduceAllocationAndPointerComparisons
 */
--- a/test/hotspot/jtreg/compiler/escapeAnalysis/TestIterativeEA.java
+++ b/test/hotspot/jtreg/compiler/escapeAnalysis/TestIterativeEA.java
@ -40,7 +40,7 @@ public class TestIterativeEA {

  public static void main(String[] args) throws Exception {
    ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
-                "-server", "-XX:-TieredCompilation", "-Xbatch", "-XX:+PrintEliminateAllocations",
+                 "-XX:-TieredCompilation", "-Xbatch", "-XX:+PrintEliminateAllocations",
                 Launcher.class.getName());

    OutputAnalyzer analyzer = new OutputAnalyzer(pb.start());
--- a/test/hotspot/jtreg/compiler/escapeAnalysis/TestReduceAllocationAndNonReduciblePhi.java
+++ b/test/hotspot/jtreg/compiler/escapeAnalysis/TestReduceAllocationAndNonReduciblePhi.java
@ -35,7 +35,6 @@
 *                   -XX:CompileCommand=inline,*Point*::*
 *                   -XX:CompileCommand=exclude,*::dummy*
 *                   -Xbatch
- *                   -server
 *                   compiler.escapeAnalysis.TestReduceAllocationAndNonReduciblePhi
 *
 * @run main compiler.escapeAnalysis.TestReduceAllocationAndNonReduciblePhi
--- a/test/hotspot/jtreg/compiler/inlining/InlineBimorphicVirtualCallAfterMorphismChanged.java
+++ b/test/hotspot/jtreg/compiler/inlining/InlineBimorphicVirtualCallAfterMorphismChanged.java
@ -29,6 +29,7 @@
 * @modules java.base/jdk.internal.misc
 * @library /test/lib
 * @requires vm.flagless
+ * @requires vm.flavor == "server" & !vm.emulatedClient
 *
 * @run driver compiler.inlining.InlineBimorphicVirtualCallAfterMorphismChanged
 */
@ -93,7 +94,7 @@ public class InlineBimorphicVirtualCallAfterMorphismChanged {

    private static void test(String option) throws Exception {
        ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
-            "-server", "-XX:+UnlockDiagnosticVMOptions", "-XX:+PrintInlining",
+            "-XX:+UnlockDiagnosticVMOptions", "-XX:+PrintInlining",
            "-XX:CompileCommand=compileonly,*::callSiteHolder", option,
            AbstractBase.class.getName()
        );
--- a/test/hotspot/jtreg/compiler/intrinsics/math/TestMinMaxIntrinsics.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/math/TestMinMaxIntrinsics.java
@ -34,7 +34,7 @@
 * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
 *
 * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
-*                   -server -XX:-BackgroundCompilation -XX:-UseOnStackReplacement
+*                   -XX:-BackgroundCompilation -XX:-UseOnStackReplacement
 *                   compiler.intrinsics.math.TestMinMaxIntrinsics
 */

--- a/test/hotspot/jtreg/compiler/profiling/TestTypeProfiling.java
+++ b/test/hotspot/jtreg/compiler/profiling/TestTypeProfiling.java
@ -39,13 +39,13 @@
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:-BackgroundCompilation -XX:-UseOnStackReplacement
  *                   -XX:CompileThreshold=10000
-  *                   -server -XX:-TieredCompilation -XX:TypeProfileLevel=020
+  *                   -XX:-TieredCompilation -XX:TypeProfileLevel=020
  *                   -XX:+UnlockExperimentalVMOptions -XX:PerMethodSpecTrapLimit=5000 -XX:PerMethodTrapLimit=100
  *                    compiler.profiling.TestTypeProfiling
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:-BackgroundCompilation -XX:-UseOnStackReplacement
  *                   -XX:CompileThreshold=10000
-  *                   -server -XX:-TieredCompilation -XX:TypeProfileLevel=200
+  *                   -XX:-TieredCompilation -XX:TypeProfileLevel=200
  *                   -XX:+UnlockExperimentalVMOptions -XX:PerMethodSpecTrapLimit=5000 -XX:PerMethodTrapLimit=100
  *                    compiler.profiling.TestTypeProfiling
  */
--- a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithG1.java
+++ b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithG1.java
@ -33,7 +33,7 @@ import java.io.IOException;
 * @requires vm.gc.G1
 * @requires vm.flavor == "server" & !vm.emulatedClient
 * @summary Stress the G1 GC by trying to make old objects more likely to be garbage than young objects.
- * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx256m -server -XX:+UseG1GC gc.stress.gcbasher.TestGCBasherWithG1 120000
+ * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx256m -XX:+UseG1GC gc.stress.gcbasher.TestGCBasherWithG1 120000
 */
 public class TestGCBasherWithG1 {
    public static void main(String[] args) throws IOException {
--- a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithParallel.java
+++ b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithParallel.java
@ -33,7 +33,7 @@ import java.io.IOException;
 * @requires vm.gc.Parallel
 * @requires vm.flavor == "server" & !vm.emulatedClient
 * @summary Stress the Parallel GC by trying to make old objects more likely to be garbage than young objects.
- * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx256m -server -XX:+UseParallelGC -XX:-UseGCOverheadLimit gc.stress.gcbasher.TestGCBasherWithParallel 120000
+ * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx256m -XX:+UseParallelGC -XX:-UseGCOverheadLimit gc.stress.gcbasher.TestGCBasherWithParallel 120000
 */
 public class TestGCBasherWithParallel {
    public static void main(String[] args) throws IOException {
--- a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithSerial.java
+++ b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithSerial.java
@ -33,7 +33,7 @@ import java.io.IOException;
 * @requires vm.gc.Serial
 * @requires vm.flavor == "server" & !vm.emulatedClient
 * @summary Stress the Serial GC by trying to make old objects more likely to be garbage than young objects.
- * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx256m -server -XX:+UseSerialGC gc.stress.gcbasher.TestGCBasherWithSerial 120000
+ * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx256m -XX:+UseSerialGC gc.stress.gcbasher.TestGCBasherWithSerial 120000
 */
 public class TestGCBasherWithSerial {
    public static void main(String[] args) throws IOException {
--- a/test/hotspot/jtreg/runtime/CDSCompressedKPtrs/XShareAuto.java
+++ b/test/hotspot/jtreg/runtime/CDSCompressedKPtrs/XShareAuto.java
@ -25,8 +25,7 @@
 * @test
 * @requires vm.cds
 * @requires vm.flagless
- * @bug 8005933
- * @summary -Xshare:auto is the default when -Xshare is not specified
+ * @summary -Xshare:auto is the default
 * @library /test/lib
 * @modules java.base/jdk.internal.misc
 *          java.management
@ -40,7 +39,7 @@ import jdk.test.lib.process.OutputAnalyzer;
 public class XShareAuto {
    public static void main(String[] args) throws Exception {
        ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
-            "-server", "-XX:+UnlockDiagnosticVMOptions",
+            "-XX:+UnlockDiagnosticVMOptions",
            "-XX:SharedArchiveFile=./XShareAuto.jsa", "-Xshare:dump", "-Xlog:cds");
        OutputAnalyzer output = new OutputAnalyzer(pb.start());
        output.shouldContain("Loading classes to share");