Mercurial > hg > truffle

diff src/share/vm/prims/jni.cpp @ 7126:ce248dc0a656

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed all Graal modifications to ci and c1
author Doug Simon <doug.simon@oracle.com>
date Mon, 03 Dec 2012 17:54:05 +0100
parents 35568cbc6a43
children 291ffc492eb6
line wrap: on
line diff
--- a/src/share/vm/prims/jni.cpp	Mon Dec 03 15:32:17 2012 +0100
+++ b/src/share/vm/prims/jni.cpp	Mon Dec 03 17:54:05 2012 +0100
@@ -5152,8 +5152,8 @@
     *(JNIEnv**)penv = thread->jni_environment();
 
 #ifdef GRAAL
-    GraalCompiler* compiler = GraalCompiler::instance();
-    compiler->initialize();
+    GraalCompiler* graal_compiler = GraalCompiler::instance();
+    graal_compiler->initialize();
 #endif
 
     // Tracks the time application was running before GC