--- a/hotspot/src/share/vm/jvmci/jvmciCodeInstaller.cpp	Thu Jul 28 09:57:49 2016 -0400
+++ b/hotspot/src/share/vm/jvmci/jvmciCodeInstaller.cpp	Fri Jul 29 09:23:05 2016 +0200
@@ -765,7 +765,7 @@
     }
     last_pc_offset = pc_offset;
 
-    if (CodeInstallSafepointChecks && SafepointSynchronize::do_call_back()) {
+    if (SafepointSynchronize::do_call_back()) {
       // this is a hacky way to force a safepoint check but nothing else was jumping out at me.
       ThreadToNativeFromVM ttnfv(JavaThread::current());
     }