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

@@ -27,11 +27,10 @@
 import static jdk.vm.ci.hotspot.HotSpotVMConfig.config;
 import static jdk.vm.ci.hotspot.UnsafeAccess.UNSAFE;
 
 import java.lang.invoke.MethodHandle;
 
-import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.meta.ConstantPool;
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaField;
 import jdk.vm.ci.meta.JavaMethod;
 import jdk.vm.ci.meta.JavaType;

@@ -156,11 +155,11 @@
             static JVM_CONSTANT get(int tag) {
                 JVM_CONSTANT res = table[indexOf(tag)];
                 if (res != null) {
                     return res;
                 }
-                throw new JVMCIError("Unknown JVM_CONSTANT tag %s", tag);
+                throw new InternalError("Unknown JVM_CONSTANT tag " + tag);
             }
         }
 
         public static JVM_CONSTANT getEnum(int tag) {
             return TagValueMap.get(tag);

@@ -506,11 +505,11 @@
             case MethodType:
             case MethodTypeInError:
                 Object obj = compilerToVM().resolveConstantInPool(this, cpi);
                 return HotSpotObjectConstantImpl.forObject(obj);
             default:
-                throw new JVMCIError("Unknown constant pool tag %s", tag);
+                throw new InternalError("Unknown constant pool tag " + tag);
         }
     }
 
     @Override
     public String lookupUtf8(int cpi) {

@@ -653,11 +652,11 @@
                 index = rawIndexToConstantPoolIndex(cpi, opcode);
                 index = compilerToVM().constantPoolRemapInstructionOperandFromCache(this, index);
                 break;
             }
             default:
-                throw JVMCIError.shouldNotReachHere("Unexpected opcode " + opcode);
+                throw new InternalError("Unexpected opcode " + opcode);
         }
 
         final JVM_CONSTANT tag = getTagAt(index);
         if (tag == null) {
             assert getTagAt(index - 1) == JVM_CONSTANT.Double || getTagAt(index - 1) == JVM_CONSTANT.Long;