*** old/src/share/vm/runtime/sweeper.cpp	Tue Oct  7 12:56:31 2014
--- new/src/share/vm/runtime/sweeper.cpp	Tue Oct  7 12:56:31 2014

*** 541,553 ****
--- 541,554 ----
      // stack we can safely convert it to a zombie method
      if (nm->can_not_entrant_be_converted()) {
        if (PrintMethodFlushing && Verbose) {
          tty->print_cr("### Nmethod %3d/" PTR_FORMAT " (not entrant) being made zombie", nm->compile_id(), nm);
        }
+       // Do not check for a safepoint here
+       MutexLockerEx cl(CompiledIC_lock, Mutex::_no_safepoint_check_flag);
        // Clear ICStubs to prevent back patching stubs of zombie or unloaded
        // nmethods during the next safepoint (see ICStub::finalize).
        MutexLocker cl(CompiledIC_lock);
        nm->clear_ic_stubs();
        // Code cache state change is tracked in make_zombie()
        nm->make_zombie();
        _zombified_count++;
        SWEEP(nm);