src/jdk.vm.ci.hotspot/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java

*** 33,44 ****
--- 33,46 ----
  import java.lang.reflect.Modifier;
  import java.util.Collections;
  import java.util.HashMap;
  import java.util.Map;
  import java.util.Objects;
+ import java.util.ServiceLoader;
  import java.util.TreeMap;
  
+ import jdk.internal.misc.VM;
  import jdk.vm.ci.code.Architecture;
  import jdk.vm.ci.code.CompilationRequestResult;
  import jdk.vm.ci.code.CompiledCode;
  import jdk.vm.ci.code.InstalledCode;
  import jdk.vm.ci.common.JVMCIError;
*** 49,60 ****
  import jdk.vm.ci.meta.JavaType;
  import jdk.vm.ci.meta.ResolvedJavaType;
  import jdk.vm.ci.runtime.JVMCI;
  import jdk.vm.ci.runtime.JVMCIBackend;
  import jdk.vm.ci.runtime.JVMCICompiler;
- import jdk.vm.ci.services.Services;
- import jdk.internal.misc.VM;
  
  //JaCoCo Exclude
  
  /**
   * HotSpot implementation of a JVMCI runtime.
--- 51,60 ----
*** 180,190 ****
              }
          }
      }
  
      public static HotSpotJVMCIBackendFactory findFactory(String architecture) {
!         for (HotSpotJVMCIBackendFactory factory : Services.load(HotSpotJVMCIBackendFactory.class)) {
              if (factory.getArchitecture().equalsIgnoreCase(architecture)) {
                  return factory;
              }
          }
  
--- 180,190 ----
              }
          }
      }
  
      public static HotSpotJVMCIBackendFactory findFactory(String architecture) {
!         for (HotSpotJVMCIBackendFactory factory : ServiceLoader.load(HotSpotJVMCIBackendFactory.class)) {
              if (factory.getArchitecture().equalsIgnoreCase(architecture)) {
                  return factory;
              }
          }
  
*** 229,239 ****
  
          try (InitTimer t = timer("create JVMCI backend:", hostArchitecture)) {
              hostBackend = registerBackend(factory.createJVMCIBackend(this, null));
          }
  
!         vmEventListeners = Services.load(HotSpotVMEventListener.class);
  
          JVMCIMetaAccessContext context = null;
          for (HotSpotVMEventListener vmEventListener : vmEventListeners) {
              context = vmEventListener.createMetaAccessContext(this);
              if (context != null) {
--- 229,239 ----
  
          try (InitTimer t = timer("create JVMCI backend:", hostArchitecture)) {
              hostBackend = registerBackend(factory.createJVMCIBackend(this, null));
          }
  
!         vmEventListeners = ServiceLoader.load(HotSpotVMEventListener.class);
  
          JVMCIMetaAccessContext context = null;
          for (HotSpotVMEventListener vmEventListener : vmEventListeners) {
              context = vmEventListener.createMetaAccessContext(this);
              if (context != null) {