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

*** 41,51 ****
  import java.util.jar.Manifest;
  import java.util.stream.Stream;
  
  import jdk.internal.access.JavaLangAccess;
  import jdk.internal.access.SharedSecrets;
- import jdk.internal.misc.VM;
  import jdk.internal.module.Modules;
  import jdk.internal.module.ServicesCatalog;
  import jdk.internal.util.StaticProperty;
  
  /**
--- 41,50 ----
*** 66,87 ****
      }
  
      // ServiceCatalog for the boot class loader
      private static final ServicesCatalog SERVICES_CATALOG;
      static {
!         if (ArchivedData.servicesCatalog != null) {
!             SERVICES_CATALOG = ArchivedData.servicesCatalog;
          } else {
              SERVICES_CATALOG = ServicesCatalog.create();
-             ArchivedData.servicesCatalog = SERVICES_CATALOG;
-         }
-     }
- 
-     static class ArchivedData {
-         static ServicesCatalog servicesCatalog;
-         static {
-             VM.initializeFromArchive(ArchivedData.class);
          }
      }
  
      // ClassLoaderValue map for the boot class loader
      private static final ConcurrentHashMap<?, ?> CLASS_LOADER_VALUE_MAP
--- 65,79 ----
      }
  
      // ServiceCatalog for the boot class loader
      private static final ServicesCatalog SERVICES_CATALOG;
      static {
!         ArchivedClassLoaders archivedClassLoaders = ArchivedClassLoaders.get();
!         if (archivedClassLoaders != null) {
!             SERVICES_CATALOG = archivedClassLoaders.servicesCatalog(null);
          } else {
              SERVICES_CATALOG = ServicesCatalog.create();
          }
      }
  
      // ClassLoaderValue map for the boot class loader
      private static final ConcurrentHashMap<?, ?> CLASS_LOADER_VALUE_MAP