--- old/src/share/vm/ci/ciStreams.cpp	2016-12-20 14:34:23.863342910 +0100
+++ new/src/share/vm/ci/ciStreams.cpp	2016-12-20 14:34:23.227342939 +0100
@@ -172,6 +172,8 @@
   case Bytecodes::_new:
   case Bytecodes::_vnew:
   case Bytecodes::_newarray:
+  case Bytecodes::_vunbox:
+  case Bytecodes::_vbox:
     return get_index_u2();
   default:
     ShouldNotReachHere();
@@ -182,8 +184,8 @@
 // ------------------------------------------------------------------
 // ciBytecodeStream::get_klass
 //
-// If this bytecode is a new, newarray, multianewarray, instanceof,
-// or checkcast, get the referenced klass.
+// If this bytecode is a new, newarray, multianewarray, instanceof, vbox,
+// vunbox, or checkcast, get the referenced klass.
 ciKlass* ciBytecodeStream::get_klass(bool& will_link) {
   VM_ENTRY_MARK;
   constantPoolHandle cpool(_method->get_Method()->constants());