src/java.base/share/classes/jdk/internal/loader/BuiltinClassLoader.java

*** 55,66 ****
  import java.util.concurrent.ConcurrentHashMap;
  import java.util.jar.Attributes;
  import java.util.jar.Manifest;
  import java.util.stream.Stream;
  
- import jdk.internal.module.ModulePatcher.PatchedModuleReader;
  import jdk.internal.misc.VM;
  
  
  /**
   * The platform or application class loader. Resources loaded from modules
   * defined to the boot class loader are also loaded via an instance of this
--- 55,67 ----
  import java.util.concurrent.ConcurrentHashMap;
  import java.util.jar.Attributes;
  import java.util.jar.Manifest;
  import java.util.stream.Stream;
  
  import jdk.internal.misc.VM;
+ import jdk.internal.module.ModulePatcher.PatchedModuleReader;
+ import jdk.internal.module.SystemModules;
  
  
  /**
   * The platform or application class loader. Resources loaded from modules
   * defined to the boot class loader are also loaded via an instance of this
*** 133,143 ****
      }
  
  
      // maps package name to loaded module for modules in the boot layer
      private static final Map<String, LoadedModule> packageToModule
!         = new ConcurrentHashMap<>(1024);
  
      // maps a module name to a module reference
      private final Map<String, ModuleReference> nameToModule;
  
      // maps a module reference to a module reader
--- 134,144 ----
      }
  
  
      // maps package name to loaded module for modules in the boot layer
      private static final Map<String, LoadedModule> packageToModule
!         = new ConcurrentHashMap<>(SystemModules.PACKAGES_IN_BOOT_LAYER);
  
      // maps a module name to a module reference
      private final Map<String, ModuleReference> nameToModule;
  
      // maps a module reference to a module reader
*** 920,930 ****
  
      /**
       * Returns the ModuleReader for the given module.
       */
      private ModuleReader moduleReaderFor(ModuleReference mref) {
!         return moduleToReader.computeIfAbsent(mref, m -> createModuleReader(mref));
      }
  
      /**
       * Creates a ModuleReader for the given module.
       */
--- 921,931 ----
  
      /**
       * Returns the ModuleReader for the given module.
       */
      private ModuleReader moduleReaderFor(ModuleReference mref) {
!         return moduleToReader.computeIfAbsent(mref, m -> createModuleReader(m));
      }
  
      /**
       * Creates a ModuleReader for the given module.
       */