--- a/src/hotspot/share/gc/g1/g1VMOperations.cpp	Mon Apr 29 14:34:10 2019 -0400
+++ b/src/hotspot/share/gc/g1/g1VMOperations.cpp	Mon Apr 29 16:01:52 2019 -0400
@@ -191,10 +191,10 @@
       JavaThread* jt = (JavaThread*)thr;
       ThreadToNativeFromVM native(jt);
 
-      MutexLocker x(FullGCCount_lock, Mutex::_no_safepoint_check_flag);
+      MonitorLocker ml(FullGCCount_lock, Mutex::_no_safepoint_check_flag);
       while (g1h->old_marking_cycles_completed() <=
                                           _old_marking_cycles_completed_before) {
-        FullGCCount_lock->wait_without_safepoint_check();
+        ml.wait();
       }
     }
   }