Mercurial > hg > graal-compiler
changeset 9728:2dc020b33a6e
set bootstrapRunning flag earlier (in VMToCompiler.startCompiler)
author | Lukas Stadler <lukas.stadler@jku.at> |
---|---|
date | Thu, 16 May 2013 18:14:55 +0200 |
parents | 0dd573144b5b |
children | 4c2c99854535 |
files | graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompiler.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java src/share/vm/graal/graalCompiler.cpp src/share/vm/graal/graalVMToCompiler.cpp src/share/vm/graal/graalVMToCompiler.hpp |
diffstat | 5 files changed, 10 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompiler.java Thu May 16 18:12:06 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompiler.java Thu May 16 18:14:55 2013 +0200 @@ -53,7 +53,7 @@ void shutdownCompiler() throws Throwable; - void startCompiler() throws Throwable; + void startCompiler(boolean bootstrapEnabled) throws Throwable; void bootstrap() throws Throwable;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java Thu May 16 18:12:06 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java Thu May 16 18:14:55 2013 +0200 @@ -101,7 +101,9 @@ assert unsafe.getObject(mirror, offset) == type; } - public void startCompiler() throws Throwable { + public void startCompiler(boolean bootstrapEnabled) throws Throwable { + + bootstrapRunning = bootstrapEnabled; HotSpotVMConfig config = graalRuntime.getConfig(); long offset = config.graalMirrorInClassOffset; @@ -339,7 +341,6 @@ TTY.flush(); long startTime = System.currentTimeMillis(); - bootstrapRunning = true; boolean firstRun = true; do { // Initialize compile queue with a selected set of methods.
--- a/src/share/vm/graal/graalCompiler.cpp Thu May 16 18:12:06 2013 +0200 +++ b/src/share/vm/graal/graalCompiler.cpp Thu May 16 18:14:55 2013 +0200 @@ -95,7 +95,7 @@ } } if (UseCompiler) { - VMToCompiler::startCompiler(); + VMToCompiler::startCompiler(BootstrapGraal); _initialized = true; if (BootstrapGraal) { // We turn off CompileTheWorld and complete the VM startup so that
--- a/src/share/vm/graal/graalVMToCompiler.cpp Thu May 16 18:12:06 2013 +0200 +++ b/src/share/vm/graal/graalVMToCompiler.cpp Thu May 16 18:14:55 2013 +0200 @@ -123,12 +123,13 @@ } } -void VMToCompiler::startCompiler() { +void VMToCompiler::startCompiler(jboolean bootstrap_enabled) { JavaThread* THREAD = JavaThread::current(); JavaValue result(T_VOID); JavaCallArguments args; args.push_oop(instance()); - JavaCalls::call_interface(&result, vmToCompilerKlass(), vmSymbols::startCompiler_name(), vmSymbols::void_method_signature(), &args, THREAD); + args.push_int(bootstrap_enabled); + JavaCalls::call_interface(&result, vmToCompilerKlass(), vmSymbols::startCompiler_name(), vmSymbols::bool_void_signature(), &args, THREAD); check_pending_exception("Error while calling startCompiler"); }
--- a/src/share/vm/graal/graalVMToCompiler.hpp Thu May 16 18:12:06 2013 +0200 +++ b/src/share/vm/graal/graalVMToCompiler.hpp Thu May 16 18:14:55 2013 +0200 @@ -59,8 +59,8 @@ // public abstract void shutdownCompiler(); static void shutdownCompiler(); - // public abstract void startCompiler(); - static void startCompiler(); + // public abstract void startCompiler(boolean bootstrapEnabled); + static void startCompiler(jboolean bootstrap_enabled); // public abstract void bootstrap(); static void bootstrap();