*** old/src/share/vm/prims/jni.cpp	Wed Sep 16 15:18:53 2015
--- new/src/share/vm/prims/jni.cpp	Wed Sep 16 15:18:53 2015

*** 79,88 ****
--- 79,92 ----
  #include "utilities/histogram.hpp"
  #include "utilities/macros.hpp"
  #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;
  
  #ifdef _WIN32
  extern LONG WINAPI topLevelExceptionFilter(_EXCEPTION_POINTERS* );

*** 3982,3991 ****
--- 3986,4008 ----
      assert(!thread->has_pending_exception(), "should have returned not OK");
      /* thread is thread_in_vm here */
      *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();
  
      // Notify JVMTI
      if (JvmtiExport::should_post_thread_life()) {