Mercurial > hg > graal-jvmci-8

diff src/share/vm/runtime/mutex.cpp @ 11173:6b0fd0964b87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 31 Jul 2013 11:00:54 +0200
parents 5e3b6f79d280
children de6a9e811145
line wrap: on
line diff
--- a/src/share/vm/runtime/mutex.cpp	Tue Jul 30 13:03:28 2013 -0700
+++ b/src/share/vm/runtime/mutex.cpp	Wed Jul 31 11:00:54 2013 +0200
@@ -1370,6 +1370,10 @@
     debug_only(if (rank() != Mutex::special) \
       thread->check_for_valid_safepoint_state(false);)
   }
+  if (thread->is_Watcher_thread()) {
+    assert(!WatcherThread::watcher_thread()->has_crash_protection(),
+        "locking not allowed when crash protection is set");
+  }
 }
 
 void Monitor::check_block_state(Thread *thread) {