--- old/src/hotspot/share/gc/shared/memAllocator.cpp	2019-07-30 16:03:19.966458289 -0400
+++ new/src/hotspot/share/gc/shared/memAllocator.cpp	2019-07-30 16:03:19.686458299 -0400
@@ -172,11 +172,9 @@
   // This is a VM policy failure, so how do we exhaustively test it?
   assert(!_thread->has_pending_exception(),
          "shouldn't be allocating with pending exception");
-  if (StrictSafepointChecks) {
-    // Allocation of an oop can always invoke a safepoint,
-    // hence, the true argument.
-    _thread->check_for_valid_safepoint_state(true);
-  }
+  // Allocation of an oop can always invoke a safepoint,
+  // hence, the true argument.
+  _thread->check_for_valid_safepoint_state(true);
 }
 #endif
 
--- old/src/hotspot/share/runtime/globals.hpp	2019-07-30 16:03:20.318458277 -0400
+++ new/src/hotspot/share/runtime/globals.hpp	2019-07-30 16:03:20.070458286 -0400
@@ -398,10 +398,6 @@
           "Set when executing debug methods in debug.cpp "                  \
           "(to prevent triggering assertions)")                             \
                                                                             \
-  notproduct(bool, StrictSafepointChecks, trueInDebug,                      \
-          "Enable strict checks that safepoints cannot happen for threads " \
-          "that use NoSafepointVerifier")                                   \
-                                                                            \
   notproduct(bool, VerifyLastFrame, false,                                  \
           "Verify oops on last frame on entry to VM")                       \
                                                                             \
--- old/src/hotspot/share/runtime/mutex.cpp	2019-07-30 16:03:20.710458263 -0400
+++ new/src/hotspot/share/runtime/mutex.cpp	2019-07-30 16:03:20.470458272 -0400
@@ -53,7 +53,7 @@
   }
 #endif // CHECK_UNHANDLED_OOPS
 
-  DEBUG_ONLY(check_prelock_state(self, StrictSafepointChecks));
+  DEBUG_ONLY(check_prelock_state(self, true));
   assert(_owner != self, "invariant");
 
   Monitor* in_flight_monitor = NULL;
--- old/src/hotspot/share/runtime/synchronizer.cpp	2019-07-30 16:03:21.046458252 -0400
+++ new/src/hotspot/share/runtime/synchronizer.cpp	2019-07-30 16:03:20.826458259 -0400
@@ -442,7 +442,7 @@
 ObjectLocker::ObjectLocker(Handle obj, Thread* thread, bool doLock) {
   _dolock = doLock;
   _thread = thread;
-  debug_only(if (StrictSafepointChecks) _thread->check_for_valid_safepoint_state(false);)
+  _thread->check_for_valid_safepoint_state(false);
   _obj = obj;
 
   if (_dolock) {