--- a/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp	Wed Jul 05 11:03:19 2017 -0700
+++ b/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp	Thu Jul 06 01:50:26 2017 +0200
@@ -347,6 +347,9 @@
         current = NULL;
         break;
       }
+
+      default:
+        break;
     }
   }
 }
@@ -1488,6 +1491,8 @@
       x = append(new LogicOp(Bytecodes::_iand, x, mask));
       break;
     }
+    default:
+      break;
   }
 
   // Check to see whether we are inlining. If so, Return
@@ -1847,6 +1852,8 @@
     case Bytecodes::_invokehandle:
       code = target->is_static() ? Bytecodes::_invokestatic : Bytecodes::_invokespecial;
       break;
+    default:
+      break;
     }
   } else {
     if (bc_raw == Bytecodes::_invokehandle) {
@@ -1993,12 +2000,12 @@
 
   // check if we could do inlining
   if (!PatchALot && Inline && target->is_loaded() &&
-      (klass->is_initialized() || klass->is_interface() && target->holder()->is_initialized())
+      (klass->is_initialized() || (klass->is_interface() && target->holder()->is_initialized()))
       && !patch_for_appendix) {
     // callee is known => check if we have static binding
     if (code == Bytecodes::_invokestatic  ||
         code == Bytecodes::_invokespecial ||
-        code == Bytecodes::_invokevirtual && target->is_final_method() ||
+        (code == Bytecodes::_invokevirtual && target->is_final_method()) ||
         code == Bytecodes::_invokedynamic) {
       ciMethod* inline_target = (cha_monomorphic_target != NULL) ? cha_monomorphic_target : target;
       // static binding => check if callee is ok