--- a/hotspot/src/share/vm/prims/methodHandles.cpp	Wed Jul 05 11:03:19 2017 -0700
+++ b/hotspot/src/share/vm/prims/methodHandles.cpp	Thu Jul 06 01:50:26 2017 +0200
@@ -357,9 +357,10 @@
   case vmIntrinsics::_linkToStatic:     return vmSymbols::linkToStatic_name();
   case vmIntrinsics::_linkToSpecial:    return vmSymbols::linkToSpecial_name();
   case vmIntrinsics::_linkToInterface:  return vmSymbols::linkToInterface_name();
+  default:
+    fatal("unexpected intrinsic id: %d %s", iid, vmIntrinsics::name_at(iid));
+    return 0;
   }
-  fatal("unexpected intrinsic id: %d %s", iid, vmIntrinsics::name_at(iid));
-  return 0;
 }
 
 Bytecodes::Code MethodHandles::signature_polymorphic_intrinsic_bytecode(vmIntrinsics::ID id) {
@@ -382,9 +383,10 @@
   case vmIntrinsics::_linkToStatic:     return JVM_REF_invokeStatic;
   case vmIntrinsics::_linkToSpecial:    return JVM_REF_invokeSpecial;
   case vmIntrinsics::_linkToInterface:  return JVM_REF_invokeInterface;
+  default:
+    fatal("unexpected intrinsic id: %d %s", iid, vmIntrinsics::name_at(iid));
+    return 0;
   }
-  fatal("unexpected intrinsic id: %d %s", iid, vmIntrinsics::name_at(iid));
-  return 0;
 }
 
 vmIntrinsics::ID MethodHandles::signature_polymorphic_name_id(Symbol* name) {
@@ -400,6 +402,7 @@
   case vmSymbols::VM_SYMBOL_ENUM_NAME(linkToStatic_name):     return vmIntrinsics::_linkToStatic;
   case vmSymbols::VM_SYMBOL_ENUM_NAME(linkToSpecial_name):    return vmIntrinsics::_linkToSpecial;
   case vmSymbols::VM_SYMBOL_ENUM_NAME(linkToInterface_name):  return vmIntrinsics::_linkToInterface;
+  default:                                                    break;
   }
 
   // Cover the case of invokeExact and any future variants of invokeFoo.