--- old/src/hotspot/share/interpreter/bytecodeInterpreter.cpp	2018-03-08 13:54:01.130975116 -0500
+++ new/src/hotspot/share/interpreter/bytecodeInterpreter.cpp	2018-03-08 13:54:00.409255613 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2357,15 +2357,12 @@
             }
 
           case JVM_CONSTANT_Class:
-          case JVM_CONSTANT_Value:
             VERIFY_OOP(constants->resolved_klass_at(index)->java_mirror());
             SET_STACK_OBJECT(constants->resolved_klass_at(index)->java_mirror(), 0);
             break;
 
           case JVM_CONSTANT_UnresolvedClass:
           case JVM_CONSTANT_UnresolvedClassInError:
-          case JVM_CONSTANT_UnresolvedValue:
-          case JVM_CONSTANT_UnresolvedValueInError:
             CALL_VM(InterpreterRuntime::ldc(THREAD, wide), handle_exception);
             SET_STACK_OBJECT(THREAD->vm_result(), 0);
             THREAD->set_vm_result(NULL);