# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1403131504 -7200
# Node ID 4f185700f4b7d0c7807b0570693909d57fd5945e
# Parent  a87f6927d73e385a78bf58d735ff609aefafc705
made BootstrapGraal have same semantics under -XX:-UseGraalCompilationQueue as -XX:+UseGraalCompilationQueue (i.e. only enabled if explicitly specified or -XX:-TieredCompilation)

diff -r a87f6927d73e -r 4f185700f4b7 src/share/vm/prims/jni.cpp
--- a/src/share/vm/prims/jni.cpp	Wed Jun 18 21:58:45 2014 +0200
+++ b/src/share/vm/prims/jni.cpp	Thu Jun 19 00:45:04 2014 +0200
@@ -5188,7 +5188,7 @@
       }
     } else {
       // Graal is initialized on a CompilerThread
-      if (BootstrapGraal) {
+      if (FLAG_IS_DEFAULT(BootstrapGraal) ? !TieredCompilation : BootstrapGraal) {
         GraalCompiler::instance()->bootstrap();
       }
     }