Mercurial > hg > truffle
changeset 12647:b038b643a3a4
restricted BootstrapGraal option to GRAALVM builds only
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Wed, 30 Oct 2013 21:49:04 +0100 |
| parents | 0046afcda972 |
| children | 1fbe3ca3d30d |
| files | mx/commands.py mx/sanitycheck.py src/share/vm/graal/graalCompiler.cpp src/share/vm/graal/graalGlobals.hpp |
| diffstat | 4 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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']
--- 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')
--- 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);
--- 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") \