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

*** 35,49 ****
  import java.util.HashMap;
  import java.util.Map;
  import java.util.Objects;
  import java.util.TreeMap;
  
  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;
  import jdk.vm.ci.hotspot.services.HotSpotJVMCICompilerFactory;
  import jdk.vm.ci.hotspot.services.HotSpotVMEventListener;
  import jdk.vm.ci.inittimer.InitTimer;
  import jdk.vm.ci.inittimer.SuppressFBWarnings;
  import jdk.vm.ci.meta.JVMCIMetaAccessContext;
--- 35,49 ----
  import java.util.HashMap;
  import java.util.Map;
  import java.util.Objects;
  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.hotspot.services.HotSpotJVMCICompilerFactory;
  import jdk.vm.ci.hotspot.services.HotSpotVMEventListener;
  import jdk.vm.ci.inittimer.InitTimer;
  import jdk.vm.ci.inittimer.SuppressFBWarnings;
  import jdk.vm.ci.meta.JVMCIMetaAccessContext;
*** 53,63 ****
  import jdk.vm.ci.runtime.JVMCI;
  import jdk.vm.ci.runtime.JVMCIBackend;
  import jdk.vm.ci.runtime.JVMCICompiler;
  import jdk.vm.ci.runtime.services.JVMCICompilerFactory;
  import jdk.vm.ci.services.Services;
- import jdk.internal.misc.VM;
  
  //JaCoCo Exclude
  
  /**
   * HotSpot implementation of a JVMCI runtime.
--- 53,62 ----
*** 139,149 ****
                      if (type == boolean.class) {
                          this.value = Boolean.parseBoolean(propertyValue);
                      } else if (type == String.class) {
                          this.value = propertyValue;
                      } else {
!                         throw new JVMCIError("Unexpected option type " + type);
                      }
                      this.isDefault = false;
                  }
                  // Saved properties should not be interned - let's be sure
                  assert value != UNINITIALIZED;
--- 138,148 ----
                      if (type == boolean.class) {
                          this.value = Boolean.parseBoolean(propertyValue);
                      } else if (type == String.class) {
                          this.value = propertyValue;
                      } else {
!                         throw new InternalError("Unexpected option type " + type);
                      }
                      this.isDefault = false;
                  }
                  // Saved properties should not be interned - let's be sure
                  assert value != UNINITIALIZED;
*** 189,199 ****
              if (factory.getArchitecture().equalsIgnoreCase(architecture)) {
                  return factory;
              }
          }
  
!         throw new JVMCIError("No JVMCI runtime available for the %s architecture", architecture);
      }
  
      /**
       * Gets the kind of a word value on the {@linkplain #getHostJVMCIBackend() host} backend.
       */
--- 188,198 ----
              if (factory.getArchitecture().equalsIgnoreCase(architecture)) {
                  return factory;
              }
          }
  
!         throw new InternalError(String.format("No JVMCI runtime available for the %s architecture", architecture));
      }
  
      /**
       * Gets the kind of a word value on the {@linkplain #getHostJVMCIBackend() host} backend.
       */