--- a/src/hotspot/share/runtime/safepoint.cpp	Fri Nov 29 11:26:25 2019 +0100
+++ b/src/hotspot/share/runtime/safepoint.cpp	Fri Nov 29 12:09:25 2019 +0100
@@ -532,6 +532,10 @@
   return false;
 }
 
+bool SafepointSynchronize::is_forced_cleanup_needed() {
+  return ObjectSynchronizer::needs_monitor_scavenge();
+}
+
 class ParallelSPCleanupThreadClosure : public ThreadClosure {
 private:
   CodeBlobClosure* _nmethod_cl;