--- a/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp	Thu Nov 08 10:08:52 2018 +0100
+++ b/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp	Thu Nov 08 14:32:49 2018 +0100
@@ -918,7 +918,7 @@
     last_pc_offset = pc_offset;
 
     JavaThread* thread = JavaThread::current();
-    if (SafepointMechanism::poll(thread)) {
+    if (SafepointMechanism::should_block(thread)) {
       // this is a hacky way to force a safepoint check but nothing else was jumping out at me.
       ThreadToNativeFromVM ttnfv(thread);
     }