# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1440149628 -7200
# Node ID cfd7ebda543be27756759c35c25a065d39c67366
# Parent  bd786aba15a7b02215c3c1d372bba4920d09930b
run JVMCI bootstrap iff BootstrapJVMCI is true

diff -r bd786aba15a7 -r cfd7ebda543b src/share/vm/compiler/compileBroker.cpp
--- a/src/share/vm/compiler/compileBroker.cpp	Fri Aug 21 11:29:46 2015 +0200
+++ b/src/share/vm/compiler/compileBroker.cpp	Fri Aug 21 11:33:48 2015 +0200
@@ -923,7 +923,7 @@
 #if defined(COMPILERJVMCI)
   _compilers[1] = jvmci;
   if (FLAG_IS_DEFAULT(JVMCIThreads)) {
-    if (!TieredCompilation && FLAG_IS_DEFAULT(BootstrapJVMCI) || BootstrapJVMCI) {
+    if (BootstrapJVMCI) {
       // JVMCI will bootstrap so give it more threads
       c2_count = MIN2(32, os::active_processor_count());
     }
diff -r bd786aba15a7 -r cfd7ebda543b src/share/vm/prims/jni.cpp
--- a/src/share/vm/prims/jni.cpp	Fri Aug 21 11:29:46 2015 +0200
+++ b/src/share/vm/prims/jni.cpp	Fri Aug 21 11:33:48 2015 +0200
@@ -5217,7 +5217,7 @@
 
 #ifdef COMPILERJVMCI
     // JVMCI is initialized on a CompilerThread
-    if (FLAG_IS_DEFAULT(BootstrapJVMCI) ? !TieredCompilation : BootstrapJVMCI) {
+    if (BootstrapJVMCI) {
       JVMCICompiler::instance()->bootstrap();
     }
 #elif INCLUDE_JVMCI