--- old/src/share/vm/jvmci/jvmciCompiler.hpp	2016-05-11 09:26:19.044446949 +0200
+++ new/src/share/vm/jvmci/jvmciCompiler.hpp	2016-05-11 09:26:18.866446372 +0200
@@ -33,6 +33,11 @@
   bool _bootstrapping;
 
   /**
+   * True if we have seen a bootstrap compilation request.
+   */
+  volatile bool _bootstrap_compilation_request_handled;
+
+  /**
    * Number of methods successfully compiled by a call to
    * JVMCICompiler::compile_method().
    */
@@ -68,7 +73,7 @@
   // Initialization
   virtual void initialize();
 
-  void bootstrap();
+  void bootstrap(TRAPS);
 
   // Compilation entry point for methods
   virtual void compile_method(ciEnv* env, ciMethod* target, int entry_bci, DirectiveSet* directive);