--- a/src/hotspot/share/gc/g1/g1RootProcessor.cpp	Mon Apr 29 14:34:10 2019 -0400
+++ b/src/hotspot/share/gc/g1/g1RootProcessor.cpp	Mon Apr 29 16:01:52 2019 -0400
@@ -61,7 +61,7 @@
   if ((uint)_n_workers_discovered_strong_classes != n_workers()) {
     MonitorLocker ml(&_lock, Mutex::_no_safepoint_check_flag);
     while ((uint)_n_workers_discovered_strong_classes != n_workers()) {
-      _lock.wait_without_safepoint_check(0);
+      ml.wait(0);
     }
   }
 }