--- a/src/hotspot/share/runtime/mutexLocker.cpp Wed Oct 30 16:14:56 2019 +0100
+++ b/src/hotspot/share/runtime/mutexLocker.cpp Wed Oct 30 19:43:52 2019 +0100
@@ -312,7 +312,7 @@
#if INCLUDE_JFR
def(JfrMsg_lock , PaddedMonitor, leaf, true, _safepoint_check_always);
def(JfrBuffer_lock , PaddedMutex , leaf, true, _safepoint_check_never);
- def(JfrStream_lock , PaddedMutex , leaf+1, true, _safepoint_check_never); // ensure to rank lower than 'safepoint'
+ def(JfrStream_lock , PaddedMutex , nonleaf + 1, false, _safepoint_check_always);
def(JfrStacktrace_lock , PaddedMutex , special, true, _safepoint_check_never);
def(JfrThreadSampler_lock , PaddedMonitor, leaf, true, _safepoint_check_never);
#endif