Mercurial > hg > graal-jvmci-8
diff src/share/vm/runtime/thread.cpp @ 16447:ce6696559683
better fix for deadlock in GraalVM under -Xcomp (JBS:GRAAL-48)
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Thu, 10 Jul 2014 12:33:32 +0200 |
| parents | b20d00b2ac2e |
| children | a29e6e7b7a86 |
line wrap: on
line diff
--- a/src/share/vm/runtime/thread.cpp Thu Jul 10 10:20:55 2014 +0200 +++ b/src/share/vm/runtime/thread.cpp Thu Jul 10 12:33:32 2014 +0200 @@ -3745,18 +3745,7 @@ #endif // initialize compiler(s) -#if defined(COMPILERGRAAL) - if (Arguments::mode() != Arguments::_comp) { - // Only initialize compilation if not -Xcomp. Deadlock can - // occur during the class initialization below as follows: - // 1. This thread acquires the initialization lock for a class - // and then blocks while waiting for some method to be compiled. - // 2. Graal compilation thread(s) try to access the locked class - // and will block waiting for the initialization lock. This - // prevents the requested compilation in 1 from completing. - CompileBroker::compilation_init(); - } -#elif defined(COMPILER1) || defined(COMPILER2) || defined(SHARK) || defined(COMPILERGRAAL) +#if defined(COMPILER1) || defined(COMPILER2) || defined(SHARK) || defined(COMPILERGRAAL) CompileBroker::compilation_init(); #endif @@ -3770,13 +3759,6 @@ initialize_class(vmSymbols::java_lang_invoke_MethodHandleNatives(), CHECK_0); } -#if defined(COMPILERGRAAL) - if (Arguments::mode() == Arguments::_comp) { - // Do deferred compilation initialization (see above) now. - CompileBroker::compilation_init(); - } -#endif - #if INCLUDE_MANAGEMENT Management::initialize(THREAD); #endif // INCLUDE_MANAGEMENT