--- a/hotspot/src/share/vm/classfile/vmSymbols.cpp	Thu Mar 03 14:07:10 2016 +0000
+++ b/hotspot/src/share/vm/classfile/vmSymbols.cpp	Sat Mar 05 10:10:23 2016 +0100
@@ -328,8 +328,6 @@
   assert(id != vmIntrinsics::_none, "must be a VM intrinsic");
   switch(id) {
 #ifdef TRACE_HAVE_INTRINSICS
-  case vmIntrinsics::_classID:
-  case vmIntrinsics::_threadID:
   case vmIntrinsics::_counterTime:
 #endif
   case vmIntrinsics::_currentTimeMillis: