*** old/src/share/vm/code/codeCache.cpp	Mon Jan 30 16:06:32 2017
--- new/src/share/vm/code/codeCache.cpp	Mon Jan 30 16:06:32 2017

*** 1209,1219 ****
--- 1209,1219 ----
  void CodeCache::make_marked_nmethods_not_entrant() {
    assert_locked_or_safepoint(CodeCache_lock);
    CompiledMethodIterator iter;
    while(iter.next_alive()) {
      CompiledMethod* nm = iter.method();
!     if (nm->is_marked_for_deoptimization() && !nm->is_not_entrant()) {
        nm->make_not_entrant();
      }
    }
  }