src/hotspot/share/runtime/safepoint.cpp

rev 51807 : imported patch nmethod-marking.patch

*** 596,606 ****
    CodeBlobClosure* _nmethod_cl;
    DeflateMonitorCounters* _counters;
  
  public:
    ParallelSPCleanupThreadClosure(DeflateMonitorCounters* counters) :
!     _nmethod_cl(NMethodSweeper::prepare_mark_active_nmethods()), _counters(counters) {}
  
    void do_thread(Thread* thread) {
      ObjectSynchronizer::deflate_thread_local_monitors(thread, _counters);
      if (_nmethod_cl != NULL && thread->is_Java_thread() &&
          ! thread->is_Code_cache_sweeper_thread()) {
--- 596,607 ----
    CodeBlobClosure* _nmethod_cl;
    DeflateMonitorCounters* _counters;
  
  public:
    ParallelSPCleanupThreadClosure(DeflateMonitorCounters* counters) :
!     _nmethod_cl(ThreadLocalHandshakes ? NULL : NMethodSweeper::prepare_mark_active_nmethods()),
!     _counters(counters) {}
  
    void do_thread(Thread* thread) {
      ObjectSynchronizer::deflate_thread_local_monitors(thread, _counters);
      if (_nmethod_cl != NULL && thread->is_Java_thread() &&
          ! thread->is_Code_cache_sweeper_thread()) {