--- old/src/share/vm/prims/jni.cpp 2015-09-16 15:18:53.000000000 -0700 +++ new/src/share/vm/prims/jni.cpp 2015-09-16 15:18:53.000000000 -0700 @@ -81,6 +81,10 @@ #if INCLUDE_ALL_GCS #include "gc/g1/g1SATBCardTableModRefBS.hpp" #endif // INCLUDE_ALL_GCS +#if INCLUDE_JVMCI +#include "jvmci/jvmciCompiler.hpp" +#include "jvmci/jvmciRuntime.hpp" +#endif static jint CurrentVersion = JNI_VERSION_1_8; @@ -3984,6 +3988,19 @@ *vm = (JavaVM *)(&main_vm); *(JNIEnv**)penv = thread->jni_environment(); +#if INCLUDE_JVMCI + if (EnableJVMCI) { + if (UseJVMCICompiler) { + // JVMCI is initialized on a CompilerThread + if (BootstrapJVMCI) { + JavaThread* THREAD = thread; + JVMCICompiler* compiler = JVMCICompiler::instance(CATCH); + compiler->bootstrap(); + } + } + } +#endif + // Tracks the time application was running before GC RuntimeService::record_application_start();