--- a/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp	Fri Sep 28 12:47:09 2018 +0100
+++ b/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp	Fri Sep 28 15:39:31 2018 +0300
@@ -870,8 +870,8 @@
     case doubleTag:  do_ArithmeticOp_FPU(x);  return;
     case longTag:    do_ArithmeticOp_Long(x); return;
     case intTag:     do_ArithmeticOp_Int(x);  return;
+    default:         ShouldNotReachHere();    return;
   }
-  ShouldNotReachHere();
 }
 
 

--- a/src/hotspot/cpu/arm/templateTable_arm.cpp	Fri Sep 28 12:47:09 2018 +0100
+++ b/src/hotspot/cpu/arm/templateTable_arm.cpp	Fri Sep 28 15:39:31 2018 +0300
@@ -2996,6 +2996,7 @@
   switch (code) {
   case Bytecodes::_nofast_getfield: code = Bytecodes::_getfield; break;
   case Bytecodes::_nofast_putfield: code = Bytecodes::_putfield; break;
+  default: break;
   }
 
   assert(byte_no == f1_byte || byte_no == f2_byte, "byte_no out of range");