--- old/src/share/vm/opto/type.cpp	2017-06-28 15:44:56.000000000 -0700
+++ new/src/share/vm/opto/type.cpp	2017-06-28 15:44:56.000000000 -0700
@@ -269,9 +269,10 @@
       // Invalid ciConstant returned due to OutOfMemoryError in the CI
       assert(Compile::current()->env()->failing(), "otherwise should not see this");
       return NULL;
+    default:
+      // Fall through to failure
+      return NULL;
   }
-  // Fall through to failure
-  return NULL;
 }
 
 static ciConstant check_mismatched_access(ciConstant con, BasicType loadbt, bool is_unsigned) {
@@ -279,12 +280,14 @@
   switch (conbt) {
     case T_BOOLEAN: conbt = T_BYTE;   break;
     case T_ARRAY:   conbt = T_OBJECT; break;
+    default:                          break;
   }
   switch (loadbt) {
     case T_BOOLEAN:   loadbt = T_BYTE;   break;
     case T_NARROWOOP: loadbt = T_OBJECT; break;
     case T_ARRAY:     loadbt = T_OBJECT; break;
     case T_ADDRESS:   loadbt = T_OBJECT; break;
+    default:                             break;
   }
   if (conbt == loadbt) {
     if (is_unsigned && conbt == T_BYTE) {
@@ -1048,10 +1051,11 @@
   case FloatBot:
   case DoubleBot:
     return false;  // never a singleton, therefore never empty
-  }
 
-  ShouldNotReachHere();
-  return false;
+  default:
+    ShouldNotReachHere();
+    return false;
+  }
 }
 
 //------------------------------dump_stats-------------------------------------
@@ -4080,6 +4084,9 @@
     case T_ILLEGAL:
     case T_VOID:
       etype = T_BYTE;           // will produce conservatively high value
+      break;
+    default:
+      break;
     }
     cache = res = arrayOopDesc::max_array_length(etype);
   }