Mercurial > hg > truffle

changeset 18118:e98942f26fa4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graalCompiler: fix bootstrap with CTW (regression caused by jdk8-8041959)
author Bernhard Urban <bernhard.urban@jku.at>
date Fri, 17 Oct 2014 11:59:55 +0200
parents 3af9abd4d524
children 6997fce99fa3
files src/share/vm/graal/graalCompiler.cpp
diffstat 1 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/graal/graalCompiler.cpp	Fri Oct 17 10:32:04 2014 +0200
+++ b/src/share/vm/graal/graalCompiler.cpp	Fri Oct 17 11:59:55 2014 +0200
@@ -75,6 +75,13 @@
 #ifdef COMPILERGRAAL
 void GraalCompiler::bootstrap() {
   JavaThread* THREAD = JavaThread::current();
+#ifndef PRODUCT
+  // We turn off CompileTheWorld so that compilation requests are not ignored during bootstrap.
+  bool doCTW = CompileTheWorld;
+  if (CompileTheWorld) {
+    CompileTheWorld = false;
+  }
+#endif
   _bootstrapping = true;
   ResourceMark rm;
   HandleMark hm;
@@ -115,7 +122,7 @@
   }
   _bootstrapping = false;
 #ifndef PRODUCT
-    if (CompileTheWorld) {
+    if (doCTW) {
       compile_the_world();
     }
 #endif