Mercurial > hg > truffle
diff src/share/vm/runtime/mutex.cpp @ 11198:1e6d5dec4a4e
Merge.
author | Christian Humer <christian.humer@gmail.com> |
---|---|
date | Mon, 05 Aug 2013 13:20:06 +0200 |
parents | 5e3b6f79d280 |
children | de6a9e811145 |
line wrap: on
line diff
--- a/src/share/vm/runtime/mutex.cpp Thu Aug 01 21:34:57 2013 +0200 +++ b/src/share/vm/runtime/mutex.cpp Mon Aug 05 13:20:06 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) {