test/hotspot/jtreg/runtime/CommandLine/VMOptionWarning.java

@@ -1,7 +1,7 @@
  /*
-  * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
+  * Copyright (c) 2014, 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.

@@ -64,30 +64,10 @@
   * @modules java.base/jdk.internal.misc
   *          java.management
   * @run driver VMOptionWarning Develop
   */
  
- /* @test VMOptionWarningCompactObjectHeaders
-  * @bug 8360700
-  * @summary Warn if -XX:+UseCompactObjectHeaders is used with -XX:-UseObjectMonitorTable
-  * @requires vm.flagless
-  * @library /test/lib
-  * @modules java.base/jdk.internal.misc
-  *          java.management
-  * @run driver VMOptionWarning CompactObjectHeaders
-  */
- 
- /* @test VMOptionWarningUseObjectMonitorTable
-  * @bug 8360700
-  * @summary Warn if -XX:-UseObjectMonitorTable is used without -XX:-UseCompactObjectHeaders
-  * @requires vm.flagless
-  * @library /test/lib
-  * @modules java.base/jdk.internal.misc
-  *          java.management
-  * @run driver VMOptionWarning UseObjectMonitorTable
-  */
- 
  import jdk.test.lib.process.ProcessTools;
  import jdk.test.lib.process.OutputAnalyzer;
  import jdk.test.lib.Platform;
  
  public class VMOptionWarning {

@@ -125,24 +105,10 @@
                  output = new OutputAnalyzer(pb.start());
                  output.shouldNotHaveExitValue(0);
                  output.shouldContain("Error: VM option 'VerifyStack' is develop and is available only in debug version of VM.");
                  break;
              }
-             case "CompactObjectHeaders": {
-                 pb = ProcessTools.createLimitedTestJavaProcessBuilder("-XX:+UseCompactObjectHeaders", "-XX:+UnlockDiagnosticVMOptions", "-XX:-UseObjectMonitorTable", "-version");
-                 output = new OutputAnalyzer(pb.start());
-                 output.shouldHaveExitValue(0);
-                 output.shouldContain("warning: -UseObjectMonitorTable is incompatible with +UseCompactObjectHeaders; ignoring -UseObjectMonitorTable");
-                 break;
-             }
-             case "UseObjectMonitorTable": {
-                 pb = ProcessTools.createLimitedTestJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions", "-XX:-UseObjectMonitorTable", "-version");
-                 output = new OutputAnalyzer(pb.start());
-                 output.shouldHaveExitValue(0);
-                 output.shouldContain("warning: -UseObjectMonitorTable is incompatible with +UseCompactObjectHeaders; ignoring -UseObjectMonitorTable");
-                 break;
-             }
              default: {
                  throw new RuntimeException("Invalid argument: " + args[0]);
              }
          }
      }