--- a/hotspot/src/share/vm/code/codeCache.cpp	Mon Jan 30 16:04:22 2017 +0300
+++ b/hotspot/src/share/vm/code/codeCache.cpp	Tue Jan 31 01:11:40 2017 +0300
@@ -1211,7 +1211,7 @@
   CompiledMethodIterator iter;
   while(iter.next_alive()) {
     CompiledMethod* nm = iter.method();
-    if (nm->is_marked_for_deoptimization()) {
+    if (nm->is_marked_for_deoptimization() && !nm->is_not_entrant()) {
       nm->make_not_entrant();
     }
   }