--- a/src/hotspot/cpu/x86/compiledIC_x86.cpp	Fri Nov 02 07:58:22 2018 +0100
+++ b/src/hotspot/cpu/x86/compiledIC_x86.cpp	Thu Nov 01 14:57:26 2018 +0100
@@ -177,7 +177,7 @@
 }
 
 void CompiledDirectStaticCall::set_stub_to_clean(static_stub_Relocation* static_stub) {
-  assert (CompiledIC_lock->is_locked() || SafepointSynchronize::is_at_safepoint(), "mt unsafe call");
+  assert(CompiledICLocker::is_safe(static_stub->addr()), "mt unsafe call");
   // Reset stub.
   address stub = static_stub->addr();
   assert(stub != NULL, "stub not found");