--- a/hotspot/src/share/vm/code/nmethod.cpp	Wed Jul 05 11:03:19 2017 -0700
+++ b/hotspot/src/share/vm/code/nmethod.cpp	Thu Jul 06 01:50:26 2017 +0200
@@ -987,6 +987,8 @@
         }
         break;
       }
+      default:
+        break;
     }
   }
 }
@@ -2187,12 +2189,15 @@
         //verify_interrupt_point(iter.addr());
         break;
       case relocInfo::runtime_call_type:
-      case relocInfo::runtime_call_w_cp_type:
+      case relocInfo::runtime_call_w_cp_type: {
         address destination = iter.reloc()->value();
         // Right now there is no way to find out which entries support
         // an interrupt point.  It would be nice if we had this
         // information in a table.
         break;
+      }
+      default:
+        break;
     }
     assert(stub == NULL || stub_contains(stub), "static call stub outside stub section");
   }
@@ -2489,6 +2494,9 @@
         case relocInfo::poll_type:             return "poll";
         case relocInfo::poll_return_type:      return "poll_return";
         case relocInfo::type_mask:             return "type_bit_mask";
+
+        default:
+          break;
     }
   }
   return have_one ? "other" : NULL;
@@ -2674,6 +2682,8 @@
             else
               st->print("<UNKNOWN>");
           }
+        default:
+          break;
         }
       }
       st->print(" {reexecute=%d rethrow=%d return_oop=%d}", sd->should_reexecute(), sd->rethrow_exception(), sd->return_oop());
@@ -2842,6 +2852,8 @@
       st->print_cr("Static call at " INTPTR_FORMAT, p2i(iter.reloc()->addr()));
       CompiledDirectStaticCall::at(iter.reloc())->print();
       break;
+    default:
+      break;
     }
   }
 }
@@ -2981,4 +2993,3 @@
   return buf;
 }
 #endif
-