Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
Merge
  • Loading branch information
JesperIRL committed Jun 29, 2020
2 parents ac4f14c + f44f885 commit 9d6797019bad0488ad0bb7a70d381383045664f2
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 7 deletions.
@@ -1655,7 +1655,7 @@ void CompileBroker::wait_for_completion(CompileTask* task) {
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
@@ -53,7 +53,7 @@ class CompileTask : public CHeapObj<mtCompiler> {
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 @@ class CompileTask : public CHeapObj<mtCompiler> {
case Reason_CTW:
case Reason_Replay:
case Reason_Whitebox:
case Reason_MustBeCompiled:
case Reason_Bootstrap:
return _is_blocking;
default:
@@ -703,10 +703,6 @@ javax/security/auth/kerberos/KerberosTixDateTest.java 8039280 generic-
sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.java 8039280 generic-all
sun/security/provider/PolicyParser/ExtDirsChange.java 8039280 generic-all
sun/security/provider/PolicyParser/PrincipalExpansionError.java 8039280 generic-all
sun/security/provider/SecureRandom/AbstractDrbg/SpecTest.java 8247359 linux-aarch64
sun/security/provider/SecureRandom/SHA1PRNGReseed.java 8247359 linux-aarch64
sun/security/provider/SecureRandom/StrongSecureRandom.java 8247359 linux-aarch64
sun/security/provider/SeedGenerator/SeedGeneratorChoice.java 8247359 linux-aarch64

############################################################################

0 comments on commit 9d67970

Please sign in to comment.