# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1403688644 -7200
# Node ID c238f67f074585bf45edfed58ee05e46b9271d44
# Parent  bf0e3ff4b2c426d82ed5a864b7f0f4db1eff2fab# Parent  518a221dbbdef04dd08016a8094b2219a82bdd94
Merge.

diff -r bf0e3ff4b2c4 -r c238f67f0745 src/share/vm/compiler/compileBroker.cpp
--- a/src/share/vm/compiler/compileBroker.cpp	Wed Jun 25 11:30:32 2014 +0200
+++ b/src/share/vm/compiler/compileBroker.cpp	Wed Jun 25 11:30:44 2014 +0200
@@ -1211,6 +1211,13 @@
     // Should this thread wait for completion of the compile?
     blocking = is_compile_blocking(method, osr_bci);
 
+#ifdef COMPILERGRAAL
+    // Don't allow blocking compiles for requests triggered by Graal.
+    if (blocking && thread->is_Compiler_thread()) {
+      blocking = false;
+    }
+#endif
+
     // We will enter the compilation in the queue.
     // 14012000: Note that this sets the queued_for_compile bits in
     // the target method. We can now reason that a method cannot be