Mercurial > hg > truffle

changeset 16625:d2aa48d54db5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't allow blocking compilation requests to Graal if Graal itself is not yet initialized
author Doug Simon <doug.simon@oracle.com>
date Wed, 30 Jul 2014 21:48:03 +0200
parents c9284d733aa1
children 7ce626e1952c
files src/share/vm/compiler/compileBroker.cpp
diffstat 1 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/compiler/compileBroker.cpp	Wed Jul 30 18:27:14 2014 +0200
+++ b/src/share/vm/compiler/compileBroker.cpp	Wed Jul 30 21:48:03 2014 +0200
@@ -52,6 +52,7 @@
 #ifdef GRAAL
 #include "graal/graalCompiler.hpp"
 #ifdef COMPILERGRAAL
+#include "graal/graalRuntime.hpp"
 #include "runtime/vframe.hpp"
 #endif
 #endif
@@ -1204,6 +1205,12 @@
           break;
         }
       }
+
+      // Don't allow blocking compilation requests to Graal
+      // if Graal itself is not yet initialized
+      if (!GraalRuntime::is_HotSpotGraalRuntime_initialized() && compiler(comp_level)->is_graal()) {
+        blocking = false;
+      }
     }
     // Don't allow blocking compiles
 #endif