test/jtreg-ext/requires/VMProps.java

*** 120,10 ***
--- 120,11 ---
          map.put("vm.rtm.cpu", this::vmRTMCPU);
          map.put("vm.rtm.compiler", this::vmRTMCompiler);
          // vm.cds is true if the VM is compiled with cds support.
          map.put("vm.cds", this::vmCDS);
          map.put("vm.cds.custom.loaders", this::vmCDSForCustomLoaders);
+         map.put("vm.cds.supports.aot.class.linking", this::vmCDSSupportsAOTClassLinking);
          map.put("vm.cds.write.archived.java.heap", this::vmCDSCanWriteArchivedJavaHeap);
          map.put("vm.continuations", this::vmContinuations);
          // vm.graal.enabled is true if Graal is used as JIT
          map.put("vm.graal.enabled", this::isGraalEnabled);
          // jdk.hasLibgraal is true if the libgraal shared library file is present

*** 464,10 ***
--- 465,18 ---
      protected String vmCDSCanWriteArchivedJavaHeap() {
          return "" + ("true".equals(vmCDS()) && WB.canWriteJavaHeapArchive()
                       && isCDSRuntimeOptionsCompatible());
      }
  
+     /**
+      * @return true if this VM can support the -XX:AOTClassLinking option
+      */
+     protected String vmCDSSupportsAOTClassLinking() {
+       // Currently, the VM supports AOTClassLinking as long as it's able to write archived java heap.
+       return vmCDSCanWriteArchivedJavaHeap();
+     }
+ 
      /**
       * @return true if the VM options specified via the "test.cds.runtime.options"
       * property is compatible with writing Java heap objects into the CDS archive
       */
      protected boolean isCDSRuntimeOptionsCompatible() {