--- a/hotspot/src/share/vm/runtime/thread.cpp	Mon Apr 13 15:47:48 2015 +0200
+++ b/hotspot/src/share/vm/runtime/thread.cpp	Mon Apr 13 11:01:29 2015 -0700
@@ -4052,7 +4052,7 @@
          "Not in range.");
 }
 
-#ifndef PRODUCT
+#ifdef ASSERT
 void Threads::assert_all_threads_claimed() {
   ALL_JAVA_THREADS(p) {
     const int thread_parity = p->oops_do_parity();
@@ -4060,7 +4060,7 @@
         err_msg("Thread " PTR_FORMAT " has incorrect parity %d != %d", p2i(p), thread_parity, _thread_claim_parity));
   }
 }
-#endif // PRODUCT
+#endif // ASSERT
 
 void Threads::possibly_parallel_oops_do(bool is_par, OopClosure* f, CLDClosure* cld_f, CodeBlobClosure* cf) {
   int cp = Threads::thread_claim_parity();

--- a/hotspot/src/share/vm/runtime/thread.hpp	Mon Apr 13 15:47:48 2015 +0200
+++ b/hotspot/src/share/vm/runtime/thread.hpp	Mon Apr 13 11:01:29 2015 -0700
@@ -1901,7 +1901,7 @@
   // never set the global parity to 0.
   static int thread_claim_parity() { return _thread_claim_parity; }
   static void change_thread_claim_parity();
-  static void assert_all_threads_claimed() PRODUCT_RETURN;
+  static void assert_all_threads_claimed() NOT_DEBUG_RETURN;
 
   // Apply "f->do_oop" to all root oops in all threads.
   // This version may only be called by sequential code.