Mercurial > hg > truffle
diff src/share/vm/graal/graalCompiler.cpp @ 15463:a20be10ad437
made Graal work with the HotSpot compiler queue and compiler threads, enabled by -XX:-UseGraalCompilationQueue
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Fri, 02 May 2014 00:36:27 +0200 |
| parents | 6876a4599b7e |
| children | 07fac8558d7b |
line wrap: on
line diff
--- a/src/share/vm/graal/graalCompiler.cpp Fri May 02 00:17:40 2014 +0200 +++ b/src/share/vm/graal/graalCompiler.cpp Fri May 02 00:36:27 2014 +0200 @@ -44,7 +44,10 @@ // Initialization void GraalCompiler::initialize() { - + if (!should_perform_init()) { + return; + } + ThreadToNativeFromVM trans(JavaThread::current()); JavaThread* THREAD = JavaThread::current(); TRACE_graal_1("GraalCompiler::initialize"); @@ -100,7 +103,7 @@ if (UseCompiler) { _external_deopt_i2c_entry = create_external_deopt_i2c(); #ifdef COMPILERGRAAL - bool bootstrap = FLAG_IS_DEFAULT(BootstrapGraal) ? !TieredCompilation : BootstrapGraal; + bool bootstrap = UseGraalCompilationQueue && (FLAG_IS_DEFAULT(BootstrapGraal) ? !TieredCompilation : BootstrapGraal); #else bool bootstrap = false; #endif @@ -172,7 +175,7 @@ return buffer_blob; } -void GraalCompiler::compile_method(methodHandle method, int entry_bci, jboolean blocking) { +void GraalCompiler::compile_method(methodHandle method, int entry_bci, CompileTask* task, jboolean blocking) { GRAAL_EXCEPTION_CONTEXT if (!_initialized) { CompilationPolicy::policy()->delay_compilation(method()); @@ -182,7 +185,7 @@ assert(_initialized, "must already be initialized"); ResourceMark rm; thread->set_is_graal_compiling(true); - VMToCompiler::compileMethod(method(), entry_bci, blocking); + VMToCompiler::compileMethod(method(), entry_bci, (jlong) (address) task, blocking); thread->set_is_graal_compiling(false); }