src/hotspot/share/jvmci/jvmciRuntime.cpp

*** 653,663 ****
  JRT_END
  
  
  // private static JVMCIRuntime JVMCI.initializeRuntime()
  JVM_ENTRY_NO_ENV(jobject, JVM_GetJVMCIRuntime(JNIEnv *env, jclass c))
!   JNI_JVMCIENV(env);
    if (!EnableJVMCI) {
      JVMCI_THROW_MSG_NULL(InternalError, "JVMCI is not enabled");
    }
    JVMCIENV->runtime()->initialize_HotSpotJVMCIRuntime(JVMCI_CHECK_NULL);
    JVMCIObject runtime = JVMCIENV->runtime()->get_HotSpotJVMCIRuntime(JVMCI_CHECK_NULL);
--- 653,663 ----
  JRT_END
  
  
  // private static JVMCIRuntime JVMCI.initializeRuntime()
  JVM_ENTRY_NO_ENV(jobject, JVM_GetJVMCIRuntime(JNIEnv *env, jclass c))
!   JNI_JVMCIENV(thread, env);
    if (!EnableJVMCI) {
      JVMCI_THROW_MSG_NULL(InternalError, "JVMCI is not enabled");
    }
    JVMCIENV->runtime()->initialize_HotSpotJVMCIRuntime(JVMCI_CHECK_NULL);
    JVMCIObject runtime = JVMCIENV->runtime()->get_HotSpotJVMCIRuntime(JVMCI_CHECK_NULL);
*** 875,885 ****
  #endif // TARGET_ARCH_sparc
  #else
    fatal("check TLAB allocation code for address space conflicts");
  #endif
  
!   JNI_JVMCIENV(env);
  
    if (!EnableJVMCI) {
      JVMCI_THROW_MSG(InternalError, "JVMCI is not enabled");
    }
  
--- 875,885 ----
  #endif // TARGET_ARCH_sparc
  #else
    fatal("check TLAB allocation code for address space conflicts");
  #endif
  
!   JNI_JVMCIENV(thread, env);
  
    if (!EnableJVMCI) {
      JVMCI_THROW_MSG(InternalError, "JVMCI is not enabled");
    }
  
*** 1351,1360 ****
--- 1351,1364 ----
      // no OSR compilations during bootstrap - the compiler is just too slow at this point,
      // and we know that there are no endless loops
      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);
    if (JVMCIENV->has_pending_exception()) {
      JVMCIENV->describe_pending_exception(true);