--- a/hotspot/src/share/vm/prims/methodHandles.cpp	Thu Oct 15 13:28:22 2015 +0200
+++ b/hotspot/src/share/vm/prims/methodHandles.cpp	Sat Oct 17 19:40:30 2015 -0400
@@ -345,7 +345,7 @@
 
 
 Symbol* MethodHandles::signature_polymorphic_intrinsic_name(vmIntrinsics::ID iid) {
-  assert(is_signature_polymorphic_intrinsic(iid), "iid=%d", iid);
+  assert(is_signature_polymorphic_intrinsic(iid), "%d %s", iid, vmIntrinsics::name_at(iid));
   switch (iid) {
   case vmIntrinsics::_invokeBasic:      return vmSymbols::invokeBasic_name();
   case vmIntrinsics::_linkToVirtual:    return vmSymbols::linkToVirtual_name();
@@ -353,7 +353,7 @@
   case vmIntrinsics::_linkToSpecial:    return vmSymbols::linkToSpecial_name();
   case vmIntrinsics::_linkToInterface:  return vmSymbols::linkToInterface_name();
   }
-  assert(false, "");
+  fatal("unexpected intrinsic id: %d %s", iid, vmIntrinsics::name_at(iid));
   return 0;
 }
 
@@ -365,7 +365,7 @@
   case vmIntrinsics::_linkToSpecial:    return JVM_REF_invokeSpecial;
   case vmIntrinsics::_linkToInterface:  return JVM_REF_invokeInterface;
   }
-  assert(false, "iid=%d", iid);
+  fatal("unexpected intrinsic id: %d %s", iid, vmIntrinsics::name_at(iid));
   return 0;
 }