--- old/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java	2018-03-08 13:54:38.807848348 -0500
+++ new/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java	2018-03-08 13:54:38.081527396 -0500
@@ -108,9 +108,6 @@
         Class(config().jvmConstantClass),
         UnresolvedClass(config().jvmConstantUnresolvedClass),
         UnresolvedClassInError(config().jvmConstantUnresolvedClassInError),
-        Value(config().jvmConstantValue),
-        UnresolvedValue(config().jvmConstantUnresolvedValue),
-        UnresolvedValueInError(config().jvmConstantUnresolvedValueInError),
         String(config().jvmConstantString),
         Fieldref(config().jvmConstantFieldref),
         MethodRef(config().jvmConstantMethodref),
@@ -518,9 +515,6 @@
             case Class:
             case UnresolvedClass:
             case UnresolvedClassInError:
-            case Value:
-            case UnresolvedValue:
-            case UnresolvedValueInError:
                 final int opcode = -1;  // opcode is not used
                 return lookupType(cpi, opcode);
             case String:
@@ -718,15 +712,12 @@
                 index = getUncachedKlassRefIndexAt(index);
                 // Read the tag only once because it could change between multiple reads.
                 final JVM_CONSTANT klassTag = getTagAt(index);
-                assert klassTag == JVM_CONSTANT.Class || klassTag == JVM_CONSTANT.UnresolvedClass || klassTag == JVM_CONSTANT.UnresolvedClassInError ||
-                       klassTag == JVM_CONSTANT.Value || klassTag == JVM_CONSTANT.UnresolvedValue || klassTag == JVM_CONSTANT.UnresolvedValueInError : klassTag;
+                assert klassTag == JVM_CONSTANT.Class || klassTag == JVM_CONSTANT.UnresolvedClass || klassTag == JVM_CONSTANT.UnresolvedClassInError
+                       : klassTag;
                 // fall through
             case Class:
             case UnresolvedClass:
             case UnresolvedClassInError:
-            case Value:
-            case UnresolvedValue:
-            case UnresolvedValueInError:
                 final HotSpotResolvedObjectTypeImpl type = compilerToVM().resolveTypeInPool(this, index);
                 Class<?> klass = type.mirror();
                 if (!klass.isPrimitive() && !klass.isArray()) {