--- old/src/hotspot/share/code/nmethod.cpp	2019-07-30 16:02:28.630460078 -0400
+++ new/src/hotspot/share/code/nmethod.cpp	2019-07-30 16:02:28.410460085 -0400
@@ -1313,7 +1313,7 @@
   nmethodLocker nml(this);
   methodHandle the_method(method());
   // This can be called while the system is already at a safepoint which is ok
-  NoSafepointVerifier nsv(true, !SafepointSynchronize::is_at_safepoint());
+  NoSafepointVerifier nsv;
 
   // during patching, depending on the nmethod state we must notify the GC that
   // code has been unloaded, unregistering it. We cannot do this right while