Mercurial > hg > truffle

changeset 16204:c238f67f0745

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Doug Simon <doug.simon@oracle.com>
date Wed, 25 Jun 2014 11:30:44 +0200
parents bf0e3ff4b2c4 (current diff) 518a221dbbde (diff)
children d078a3239653 ec17c588abf9
files
diffstat 1 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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