test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOptionsUtils.java

*** 1,7 ***
  /*
!  * Copyright (c) 2015, 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.
--- 1,7 ---
  /*
!  * Copyright (c) 2015, 2026, 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.

*** 186,14 ***
  
          if (name.startsWith("NUMA")) {
              option.addPrepend("-XX:+UseNUMA");
          }
  
-         if (name.contains("JVMCI")) {
-             option.addPrepend("-XX:+EnableJVMCI");
-         }
- 
          switch (name) {
              case "MinHeapFreeRatio":
                  option.addPrepend("-XX:MaxHeapFreeRatio=100");
                  break;
              case "MaxHeapFreeRatio":
--- 186,10 ---

*** 225,16 ***
                  option.addPrepend("-Xshare:dump");
                  break;
              case "TLABWasteIncrement":
                  option.addPrepend("-XX:+UseParallelGC");
                  break;
-             case "BootstrapJVMCI":
-             case "PrintBootstrap":
-             case "JVMCIThreads":
-             case "JVMCIHostThreads":
-                 option.addPrepend("-XX:+UseJVMCICompiler");
-                 break;
              default:
                  /* Do nothing */
                  break;
          }
      }
--- 221,10 ---