OpenJDK / jdk / jdk
changeset 59966:561a1d66a4fd
8248168: [Graal] jck tests timeout in Graal with -Xcomp mode
Summary: Re-enable deadlock avoidance logic for JVMCI and Xcomp.
Reviewed-by: kvn
| author | iveresov |
|---|---|
| date | Fri, 26 Jun 2020 15:08:25 -0700 |
| parents | 69bc9754be7e |
| children | d90ab2b4e119 |
| files | src/hotspot/share/compiler/compileBroker.cpp src/hotspot/share/compiler/compileTask.hpp |
| diffstat | 2 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/compiler/compileBroker.cpp Thu Jun 25 18:47:26 2020 -0400 +++ b/src/hotspot/share/compiler/compileBroker.cpp Fri Jun 26 15:08:25 2020 -0700 @@ -1655,7 +1655,7 @@ bool free_task; #if INCLUDE_JVMCI 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. free_task = wait_for_jvmci_completion((JVMCICompiler*) comp, task, thread); } else
--- a/src/hotspot/share/compiler/compileTask.hpp Thu Jun 25 18:47:26 2020 -0400 +++ b/src/hotspot/share/compiler/compileTask.hpp Fri Jun 26 15:08:25 2020 -0700 @@ -53,7 +53,7 @@ Reason_CTW, // Compile the world Reason_Replay, // ciReplay 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_Count }; @@ -140,7 +140,6 @@ case Reason_CTW: case Reason_Replay: case Reason_Whitebox: - case Reason_MustBeCompiled: case Reason_Bootstrap: return _is_blocking; default: