--- a/hotspot/src/share/vm/interpreter/linkResolver.cpp	Wed Jul 05 11:03:19 2017 -0700
+++ b/hotspot/src/share/vm/interpreter/linkResolver.cpp	Thu Jul 06 01:50:26 2017 +0200
@@ -219,11 +219,12 @@
 #ifndef PRODUCT
 void CallInfo::print() {
   ResourceMark rm;
-  const char* kindstr = "unknown";
+  const char* kindstr;
   switch (_call_kind) {
-  case direct_call: kindstr = "direct"; break;
-  case vtable_call: kindstr = "vtable"; break;
-  case itable_call: kindstr = "itable"; break;
+  case direct_call: kindstr = "direct";  break;
+  case vtable_call: kindstr = "vtable";  break;
+  case itable_call: kindstr = "itable";  break;
+  default         : kindstr = "unknown"; break;
   }
   tty->print_cr("Call %s@%d %s", kindstr, _call_index,
                 _resolved_method.is_null() ? "(none)" : _resolved_method->name_and_sig_as_C_string());
@@ -1570,6 +1571,7 @@
     case Bytecodes::_invokehandle   : resolve_invokehandle   (result,       pool, index, CHECK); break;
     case Bytecodes::_invokedynamic  : resolve_invokedynamic  (result,       pool, index, CHECK); break;
     case Bytecodes::_invokeinterface: resolve_invokeinterface(result, recv, pool, index, CHECK); break;
+    default                         :                                                            break;
   }
   return;
 }
@@ -1598,6 +1600,7 @@
       break;
     default:
       fatal("bad call: %s", Bytecodes::name(byte));
+      break;
   }
 }