8232616: JVMCI_lock fails to get initialized when cds is disabled

Reviewed-by: yan
openjdk · Oct 27, 2020 · 8ea6f9edfe2b85499db30d7f289d23bb4979dec4 · 8ea6f9e · bridgekeeper · Oct 27, 2020
1 parent dae1da1
commit 8ea6f9edfe2b85499db30d7f289d23bb4979dec4
Showing with 2 additions and 2 deletions.

+2 −2 src/hotspot/share/runtime/mutexLocker.cpp
diff --git a/src/hotspot/share/runtime/mutexLocker.cpp b/src/hotspot/share/runtime/mutexLocker.cpp
@@ -358,14 +358,14 @@ void mutex_init() {
 #if INCLUDE_JVMTI
   def(CDSClassFileStream_lock      , PaddedMutex  , max_nonleaf, false, Monitor::_safepoint_check_always);
 #endif
+  def(DumpTimeTable_lock           , PaddedMutex  , leaf,        true,  Monitor::_safepoint_check_never);
+#endif // INCLUDE_CDS
 
 #if INCLUDE_JVMCI
   def(JVMCI_lock                   , PaddedMonitor, nonleaf+2,   true,  Monitor::_safepoint_check_always);
   def(JVMCIGlobalAlloc_lock        , PaddedMutex  , nonleaf,     true,  Monitor::_safepoint_check_never);
   def(JVMCIGlobalActive_lock       , PaddedMutex  , nonleaf-1,   true,  Monitor::_safepoint_check_never);
 #endif
-  def(DumpTimeTable_lock           , PaddedMutex  , leaf,        true,  Monitor::_safepoint_check_never);
-#endif // INCLUDE_CDS
 }
 
 GCMutexLocker::GCMutexLocker(Monitor * mutex) {