Mercurial > hg > truffle
comparison src/share/vm/graal/graalCompiler.cpp @ 18118:e98942f26fa4
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 | f55f2d400797 |
children | 6997fce99fa3 |
comparison
equal
deleted
inserted
replaced
18117:3af9abd4d524 | 18118:e98942f26fa4 |
---|---|
73 } | 73 } |
74 | 74 |
75 #ifdef COMPILERGRAAL | 75 #ifdef COMPILERGRAAL |
76 void GraalCompiler::bootstrap() { | 76 void GraalCompiler::bootstrap() { |
77 JavaThread* THREAD = JavaThread::current(); | 77 JavaThread* THREAD = JavaThread::current(); |
78 #ifndef PRODUCT | |
79 // We turn off CompileTheWorld so that compilation requests are not ignored during bootstrap. | |
80 bool doCTW = CompileTheWorld; | |
81 if (CompileTheWorld) { | |
82 CompileTheWorld = false; | |
83 } | |
84 #endif | |
78 _bootstrapping = true; | 85 _bootstrapping = true; |
79 ResourceMark rm; | 86 ResourceMark rm; |
80 HandleMark hm; | 87 HandleMark hm; |
81 if (PrintBootstrap) { | 88 if (PrintBootstrap) { |
82 tty->print("Bootstrapping Graal"); | 89 tty->print("Bootstrapping Graal"); |
113 if (PrintBootstrap) { | 120 if (PrintBootstrap) { |
114 tty->print_cr(" in " JLONG_FORMAT " ms (compiled %d methods)", os::javaTimeMillis() - start, _methodsCompiled); | 121 tty->print_cr(" in " JLONG_FORMAT " ms (compiled %d methods)", os::javaTimeMillis() - start, _methodsCompiled); |
115 } | 122 } |
116 _bootstrapping = false; | 123 _bootstrapping = false; |
117 #ifndef PRODUCT | 124 #ifndef PRODUCT |
118 if (CompileTheWorld) { | 125 if (doCTW) { |
119 compile_the_world(); | 126 compile_the_world(); |
120 } | 127 } |
121 #endif | 128 #endif |
122 } | 129 } |
123 | 130 |