# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1383166144 -3600
# Node ID b038b643a3a4600a7836d995d9936e8bb62449e5
# Parent  0046afcda972409b8a362a883ebaeb96508d21c9
restricted BootstrapGraal option to GRAALVM builds only

diff -r 0046afcda972 -r b038b643a3a4 mx/commands.py
--- a/mx/commands.py	Wed Oct 30 19:59:48 2013 +0100
+++ b/mx/commands.py	Wed Oct 30 21:49:04 2013 +0100
@@ -821,7 +821,7 @@
     def harness(projectscp, vmArgs):
         if not exists(javaClass) or getmtime(javaClass) < getmtime(javaSource):
             subprocess.check_call([mx.java().javac, '-cp', projectscp, '-d', mxdir, javaSource])
-        if not isGraalEnabled(_get_vm()):
+        if _get_vm() != 'graal':
             prefixArgs = ['-esa', '-ea']
         else:
             prefixArgs = ['-XX:-BootstrapGraal', '-esa', '-ea']
diff -r 0046afcda972 -r b038b643a3a4 mx/sanitycheck.py
--- a/mx/sanitycheck.py	Wed Oct 30 19:59:48 2013 +0100
+++ b/mx/sanitycheck.py	Wed Oct 30 21:49:04 2013 +0100
@@ -277,8 +277,8 @@
 
 
     args = ['-XX:+CompileTheWorld', '-Xbootclasspath/p:' + rtjar]
-    if commands.isGraalEnabled(vm):
-        args += ['-XX:+BootstrapGraal', '-G:-Debug']
+    if vm == 'graal':
+        args += ['-XX:+BootstrapGraal']
     if mode >= CTWMode.NoInline:
         if not commands.isGraalEnabled(vm):
             args.append('-XX:-Inline')
diff -r 0046afcda972 -r b038b643a3a4 src/share/vm/graal/graalCompiler.cpp
--- a/src/share/vm/graal/graalCompiler.cpp	Wed Oct 30 19:59:48 2013 +0100
+++ b/src/share/vm/graal/graalCompiler.cpp	Wed Oct 30 21:49:04 2013 +0100
@@ -98,9 +98,10 @@
     VMToCompiler::finalizeOptions(CITime);
 
     if (UseCompiler) {
-      VMToCompiler::startCompiler(BootstrapGraal);
+      bool bootstrap = GRAALVM_ONLY(BootstrapGraal) NOT_GRAALVM(false);
+      VMToCompiler::startCompiler(bootstrap);
       _initialized = true;
-      if (BootstrapGraal) {
+      if (bootstrap) {
         // We turn off CompileTheWorld and complete the VM startup so that
         // Graal can be compiled by C1/C2 when we do a CTW.
         NOT_PRODUCT(CompileTheWorld = false);
diff -r 0046afcda972 -r b038b643a3a4 src/share/vm/graal/graalGlobals.hpp
--- a/src/share/vm/graal/graalGlobals.hpp	Wed Oct 30 19:59:48 2013 +0100
+++ b/src/share/vm/graal/graalGlobals.hpp	Wed Oct 30 21:49:04 2013 +0100
@@ -49,8 +49,8 @@
   product(bool, DebugGraal, true,                                           \
           "Enable JVMTI for the compiler thread")                           \
                                                                             \
-  product(bool, BootstrapGraal, GRAALVM_ONLY(true) NOT_GRAALVM(false),      \
-          "Bootstrap Graal before running Java main method")                \
+  GRAALVM_ONLY(product(bool, BootstrapGraal, true,                          \
+          "Bootstrap Graal before running Java main method"))               \
                                                                             \
   product(intx, TraceGraal, 0,                                              \
           "Trace level for Graal")                                          \