--- a/src/hotspot/share/jvmci/jvmciRuntime.cpp Tue May 07 10:21:04 2019 +0800
+++ b/src/hotspot/share/jvmci/jvmciRuntime.cpp Mon May 06 20:05:19 2019 -0700
@@ -655,7 +655,7 @@
// private static JVMCIRuntime JVMCI.initializeRuntime()
JVM_ENTRY_NO_ENV(jobject, JVM_GetJVMCIRuntime(JNIEnv *env, jclass c))
- JNI_JVMCIENV(env);
+ JNI_JVMCIENV(thread, env);
if (!EnableJVMCI) {
JVMCI_THROW_MSG_NULL(InternalError, "JVMCI is not enabled");
}
@@ -877,7 +877,7 @@
fatal("check TLAB allocation code for address space conflicts");
#endif
- JNI_JVMCIENV(env);
+ JNI_JVMCIENV(thread, env);
if (!EnableJVMCI) {
JVMCI_THROW_MSG(InternalError, "JVMCI is not enabled");
@@ -1353,6 +1353,10 @@
compile_state->set_failure(true, "No OSR during boostrap");
return;
}
+ if (JVMCI::shutdown_called()) {
+ compile_state->set_failure(false, "Avoiding compilation during shutdown");
+ return;
+ }
HandleMark hm;
JVMCIObject receiver = get_HotSpotJVMCIRuntime(JVMCIENV);