Mercurial > hg > truffle
diff src/share/vm/runtime/java.cpp @ 4562:ef00461e29af
Merge
| author | Christian Haeubl <christian.haeubl@oracle.com> |
|---|---|
| date | Fri, 10 Feb 2012 10:16:19 -0800 |
| parents | 35ca3ade314d 723df37192d6 |
| children | 33df1aeaebbf |
line wrap: on
line diff
--- a/src/share/vm/runtime/java.cpp Fri Feb 10 10:07:48 2012 -0800 +++ b/src/share/vm/runtime/java.cpp Fri Feb 10 10:16:19 2012 -0800 @@ -30,7 +30,9 @@ #include "compiler/compileBroker.hpp" #include "compiler/compilerOracle.hpp" #include "interpreter/bytecodeHistogram.hpp" +#ifdef GRAAL #include "graal/graalCompiler.hpp" +#endif #include "memory/genCollectedHeap.hpp" #include "memory/oopFactory.hpp" #include "memory/universe.hpp" @@ -432,9 +434,7 @@ static jint volatile _before_exit_status = BEFORE_EXIT_NOT_RUN; #ifdef GRAAL - if (UseGraal) { - GraalCompiler::instance()->exit(); - } + GraalCompiler::instance()->exit(); #endif // Note: don't use a Mutex to guard the entire before_exit(), as