# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1404925349 -7200
# Node ID b20d00b2ac2e98cdfabb461629b6defa32e590ec
# Parent  2d01fb8f8acb4d6f047711d2607a76c860a2ee10
fixed deadlock in GraalVM under -Xcomp (JBS:GRAAL-48)

diff -r 2d01fb8f8acb -r b20d00b2ac2e src/share/vm/runtime/thread.cpp
--- a/src/share/vm/runtime/thread.cpp	Wed Jul 09 10:42:34 2014 +0200
+++ b/src/share/vm/runtime/thread.cpp	Wed Jul 09 19:02:29 2014 +0200
@@ -3745,7 +3745,18 @@
 #endif
 
   // initialize compiler(s)
-#if defined(COMPILER1) || defined(COMPILER2) || defined(SHARK) || defined(COMPILERGRAAL)
+#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)
   CompileBroker::compilation_init();
 #endif
 
@@ -3759,6 +3770,13 @@
     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