--- a/hotspot/src/share/vm/runtime/thread.cpp	Thu Jan 14 13:26:19 2016 +0100
+++ b/hotspot/src/share/vm/runtime/thread.cpp	Thu Jan 14 17:36:29 2016 +0100
@@ -3658,13 +3658,12 @@
     if (jvmciCompiler != NULL) {
       JVMCIRuntime::save_compiler(jvmciCompiler);
     }
-    JVMCIRuntime::maybe_print_flags(CHECK_JNI_ERR);
   }
 #endif // INCLUDE_JVMCI
 
   // initialize compiler(s)
 #if defined(COMPILER1) || defined(COMPILER2) || defined(SHARK) || INCLUDE_JVMCI
-  CompileBroker::compilation_init();
+  CompileBroker::compilation_init(CHECK_JNI_ERR);
 #endif
 
   // Pre-initialize some JSR292 core classes to avoid deadlock during class loading.