src/java.base/share/classes/jdk/internal/module/SystemModuleFinders.java

*** 52,13 ***
  import java.util.function.Supplier;
  import java.util.stream.Stream;
  import java.util.stream.StreamSupport;
  
  import jdk.internal.jimage.ImageReader;
! import jdk.internal.jimage.ImageReaderFactory;
  import jdk.internal.access.JavaNetUriAccess;
  import jdk.internal.access.SharedSecrets;
  import jdk.internal.util.StaticProperty;
  import jdk.internal.module.ModuleHashes.HashSupplier;
  
  /**
   * The factory for SystemModules objects and for creating ModuleFinder objects
--- 52,14 ---
  import java.util.function.Supplier;
  import java.util.stream.Stream;
  import java.util.stream.StreamSupport;
  
  import jdk.internal.jimage.ImageReader;
! import jdk.internal.jimage.SystemImageReader;
  import jdk.internal.access.JavaNetUriAccess;
  import jdk.internal.access.SharedSecrets;
+ import jdk.internal.misc.PreviewFeatures;
  import jdk.internal.util.StaticProperty;
  import jdk.internal.module.ModuleHashes.HashSupplier;
  
  /**
   * The factory for SystemModules objects and for creating ModuleFinder objects

*** 202,11 ***
  
          // exploded build (do not cache module finder)
          Path dir = Path.of(home, "modules");
          if (!Files.isDirectory(dir))
              throw new InternalError("Unable to detect the run-time image");
!         return ModulePath.of(ModuleBootstrap.patcher(), dir);
      }
  
      /**
       * Parses the {@code module-info.class} of all modules in the runtime image and
       * returns a ModuleFinder to find the modules.
--- 203,11 ---
  
          // exploded build (do not cache module finder)
          Path dir = Path.of(home, "modules");
          if (!Files.isDirectory(dir))
              throw new InternalError("Unable to detect the run-time image");
!         return ModulePath.of(ModuleBootstrap.patcher(), PreviewFeatures.isEnabled(), dir);
      }
  
      /**
       * Parses the {@code module-info.class} of all modules in the runtime image and
       * returns a ModuleFinder to find the modules.

*** 390,11 ***
  
      /**
       * Holder class for the ImageReader.
       */
      private static class SystemImage {
!         static final ImageReader READER = ImageReaderFactory.getImageReader();
          static ImageReader reader() {
              return READER;
          }
      }
  
--- 391,11 ---
  
      /**
       * Holder class for the ImageReader.
       */
      private static class SystemImage {
!         static final ImageReader READER = SystemImageReader.get();
          static ImageReader reader() {
              return READER;
          }
      }