src/share/vm/runtime/thread.cpp

*** 877,887 ****
             cur != Threads_lock &&
             cur != Compile_lock &&               // Temporary: should not be necessary when we get separate compilation
             cur != VMOperationRequest_lock &&
             cur != VMOperationQueue_lock) ||
             cur->rank() == Mutex::special) {
!         fatal(err_msg("Thread holding lock at safepoint that vm can block on: %s", cur->name()));
        }
      }
    }
  
    if (GCALotAtAllSafepoints) {
--- 877,887 ----
             cur != Threads_lock &&
             cur != Compile_lock &&               // Temporary: should not be necessary when we get separate compilation
             cur != VMOperationRequest_lock &&
             cur != VMOperationQueue_lock) ||
             cur->rank() == Mutex::special) {
!         fatal("Thread holding lock at safepoint that vm can block on: %s", cur->name());
        }
      }
    }
  
    if (GCALotAtAllSafepoints) {
*** 4094,4104 ****
  #ifdef ASSERT
  void Threads::assert_all_threads_claimed() {
    ALL_JAVA_THREADS(p) {
      const int thread_parity = p->oops_do_parity();
      assert((thread_parity == _thread_claim_parity),
!         err_msg("Thread " PTR_FORMAT " has incorrect parity %d != %d", p2i(p), thread_parity, _thread_claim_parity));
    }
  }
  #endif // ASSERT
  
  void Threads::possibly_parallel_oops_do(bool is_par, OopClosure* f, CLDClosure* cld_f, CodeBlobClosure* cf) {
--- 4094,4104 ----
  #ifdef ASSERT
  void Threads::assert_all_threads_claimed() {
    ALL_JAVA_THREADS(p) {
      const int thread_parity = p->oops_do_parity();
      assert((thread_parity == _thread_claim_parity),
!            "Thread " PTR_FORMAT " has incorrect parity %d != %d", p2i(p), thread_parity, _thread_claim_parity);
    }
  }
  #endif // ASSERT
  
  void Threads::possibly_parallel_oops_do(bool is_par, OopClosure* f, CLDClosure* cld_f, CodeBlobClosure* cf) {