Mercurial > hg > truffle
diff src/share/vm/runtime/javaCalls.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 | 2c940b1a48d8 |
| children | 063ec2920d21 |
line wrap: on
line diff
--- a/src/share/vm/runtime/javaCalls.cpp Fri May 02 00:17:40 2014 +0200 +++ b/src/share/vm/runtime/javaCalls.cpp Fri May 02 00:36:27 2014 +0200 @@ -52,7 +52,7 @@ guarantee(thread->is_Java_thread(), "crucial check - the VM thread cannot and must not escape to Java code"); assert(!thread->owns_locks(), "must release all locks when leaving VM"); - guarantee(!thread->is_Compiler_thread(), "cannot make java calls from the compiler"); + guarantee(thread->can_call_java(), "cannot make java calls from the compiler"); _result = result; // Allocate handle block for Java code. This must be done before we change thread_state to _thread_in_Java_or_stub, @@ -366,7 +366,7 @@ #endif - assert(!thread->is_Compiler_thread(), "cannot compile from the compiler"); + assert(thread->can_call_java(), "cannot compile from the compiler"); if (CompilationPolicy::must_be_compiled(method)) { CompileBroker::compile_method(method, InvocationEntryBci, CompilationPolicy::policy()->initial_compile_level(),