Mercurial > hg > truffle

diff src/share/vm/runtime/java.cpp @ 4559:723df37192d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make it possible again to build a real client libjvm, drop the UseGraal flag. Use the --vm option instead of a special -vm option in the bench command
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 10 Feb 2012 17:04:03 +0100
parents 3c21eee8ab4d
children ef00461e29af
line wrap: on
line diff
--- a/src/share/vm/runtime/java.cpp	Fri Feb 10 02:22:23 2012 +0100
+++ b/src/share/vm/runtime/java.cpp	Fri Feb 10 17:04:03 2012 +0100
@@ -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"
@@ -426,9 +428,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