Skip to content

Commit

Permalink
8315948: JDK-8315818 broke Xcomp on libgraal
Browse files Browse the repository at this point in the history
Reviewed-by: never, thartmann
  • Loading branch information
Doug Simon committed Sep 12, 2023
1 parent 8b4f9a8 commit 6f2684b
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions src/hotspot/share/compiler/compileBroker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1229,6 +1229,7 @@ void CompileBroker::compile_method_base(const methodHandle& method,
blocking = false;
}

// In libjvmci, JVMCI initialization should not deadlock with other threads
if (!UseJVMCINativeLibrary) {
// Don't allow blocking compiles if inside a class initializer or while performing class loading
vframeStream vfst(JavaThread::cast(thread));
Expand All @@ -1240,12 +1241,12 @@ void CompileBroker::compile_method_base(const methodHandle& method,
break;
}
}
}

// Don't allow blocking compilation requests to JVMCI
// if JVMCI itself is not yet initialized
if (!JVMCI::is_compiler_initialized() && compiler(comp_level)->is_jvmci()) {
blocking = false;
// Don't allow blocking compilation requests to JVMCI
// if JVMCI itself is not yet initialized
if (!JVMCI::is_compiler_initialized() && compiler(comp_level)->is_jvmci()) {
blocking = false;
}
}

// Don't allow blocking compilation requests if we are in JVMCIRuntime::shutdown
Expand Down

1 comment on commit 6f2684b

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.