--- old/src/hotspot/share/classfile/stackMapTable.cpp	2018-03-08 13:53:56.813742300 -0500
+++ new/src/hotspot/share/classfile/stackMapTable.cpp	2018-03-08 13:53:56.019659618 -0500
@@ -169,16 +169,10 @@
     int nconstants = _cp->length();
     if ((class_index <= 0 || class_index >= nconstants) ||
         (!_cp->tag_at(class_index).is_klass() &&
-         !_cp->tag_at(class_index).is_unresolved_klass() &&
-         !_cp->tag_at(class_index).is_value_type() &&
-         !_cp->tag_at(class_index).is_unresolved_value_type())) {
+         !_cp->tag_at(class_index).is_unresolved_klass())) {
       _stream->stackmap_format_error("bad class index", THREAD);
       return VerificationType::bogus_type();
     }
-    if (_cp->tag_at(class_index).is_value_type() ||
-        _cp->tag_at(class_index).is_unresolved_value_type()) {
-      return VerificationType::valuetype_type(_cp->klass_name_at(class_index));
-    }
     return VerificationType::reference_type(_cp->klass_name_at(class_index));
   }
   if (tag == ITEM_UninitializedThis) {