--- old/src/share/vm/runtime/sharedRuntime.cpp	2017-07-03 08:29:17.000000000 -0700
+++ new/src/share/vm/runtime/sharedRuntime.cpp	2017-07-03 08:29:16.000000000 -0700
@@ -1129,6 +1129,8 @@
                                               : Bytecodes::_invokevirtual;
           }
           break;
+        default:
+          break;
       }
     }
   } else {
@@ -1379,7 +1381,7 @@
     // which may happen when multiply alive nmethod (tiered compilation)
     // will be supported.
     if (!callee_method->is_old() &&
-        (callee == NULL || callee->is_in_use() && (callee_method->code() == callee))) {
+        (callee == NULL || (callee->is_in_use() && callee_method->code() == callee))) {
 #ifdef ASSERT
       // We must not try to patch to jump to an already unloaded method.
       if (dest_entry_point != 0) {
@@ -3168,4 +3170,3 @@
   }
   return activation;
 }
-