archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 02:54:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8248168: [Graal] jck tests timeout in Graal with -Xcomp mode

Browse source 
Re-enable deadlock avoidance logic for JVMCI and Xcomp.

Reviewed-by: kvn
This commit is contained in:
Igor Veresov 2020-06-26 15:08:25 -07:00
parent 2534e72618
commit 1ef33e4df9
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/hotspot/share/compiler/compileBroker.cpp
View file

@ -1655,7 +1655,7 @@ void CompileBroker::wait_for_completion(CompileTask* task) {
bool free_task; bool free_task;
#if INCLUDE_JVMCI #if INCLUDE_JVMCI
AbstractCompiler* comp = compiler(task->comp_level()); AbstractCompiler* comp = compiler(task->comp_level());
if (comp->is_jvmci() && !task->should_wait_for_compilation()) { if (!UseJVMCINativeLibrary && comp->is_jvmci() && !task->should_wait_for_compilation()) {
// It may return before compilation is completed. // It may return before compilation is completed.
free_task = wait_for_jvmci_completion((JVMCICompiler*) comp, task, thread); free_task = wait_for_jvmci_completion((JVMCICompiler*) comp, task, thread);
} else } else

3
src/hotspot/share/compiler/compileTask.hpp
View file

@ -53,7 +53,7 @@ class CompileTask : public CHeapObj<mtCompiler> {
Reason_CTW, // Compile the world Reason_CTW, // Compile the world
Reason_Replay, // ciReplay Reason_Replay, // ciReplay
Reason_Whitebox, // Whitebox API Reason_Whitebox, // Whitebox API
Reason_MustBeCompiled, // Java callHelper, LinkResolver Reason_MustBeCompiled, // Used for -Xcomp or AlwaysCompileLoopMethods (see CompilationPolicy::must_be_compiled())
Reason_Bootstrap, // JVMCI bootstrap Reason_Bootstrap, // JVMCI bootstrap
Reason_Count Reason_Count
}; };
@ -140,7 +140,6 @@ class CompileTask : public CHeapObj<mtCompiler> {
case Reason_CTW: case Reason_CTW:
case Reason_Replay: case Reason_Replay:
case Reason_Whitebox: case Reason_Whitebox:
case Reason_MustBeCompiled:
case Reason_Bootstrap: case Reason_Bootstrap:
return _is_blocking; return _is_blocking;
default: default: