--- a/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp Sat Nov 11 01:21:09 2017 +0100
+++ b/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp Thu Aug 31 10:00:28 2017 +0200
@@ -37,6 +37,7 @@
#include "oops/oop.inline.hpp"
#include "oops/objArrayOop.inline.hpp"
#include "runtime/javaCalls.hpp"
+#include "runtime/safepointMechanism.inline.hpp"
#include "utilities/align.hpp"
// frequently used constants
@@ -854,9 +855,10 @@
}
last_pc_offset = pc_offset;
- if (SafepointSynchronize::do_call_back()) {
+ JavaThread* thread = JavaThread::current();
+ if (SafepointMechanism::poll(thread)) {
// this is a hacky way to force a safepoint check but nothing else was jumping out at me.
- ThreadToNativeFromVM ttnfv(JavaThread::current());
+ ThreadToNativeFromVM ttnfv(thread);
}
}