Mercurial > hg > truffle

diff src/share/vm/prims/jni.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 d8d6b3de346b
children 33df1aeaebbf
line wrap: on
line diff
--- a/src/share/vm/prims/jni.cpp	Fri Feb 10 02:22:23 2012 +0100
+++ b/src/share/vm/prims/jni.cpp	Fri Feb 10 17:04:03 2012 +0100
@@ -29,7 +29,9 @@
 #include "classfile/systemDictionary.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "interpreter/linkResolver.hpp"
+#ifdef GRAAL
 #include "graal/graalCompiler.hpp"
+#endif
 #ifndef SERIALGC
 #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
 #endif // SERIALGC
@@ -5125,11 +5127,9 @@
     *(JNIEnv**)penv = thread->jni_environment();
 
 #ifdef GRAAL
-    if (UseGraal) {
       GraalCompiler* compiler = GraalCompiler::instance();
       ciObjectFactory::initialize(); 
       compiler->initialize();
-    }
 #endif
 
     // Tracks the time application was running before GC