Mercurial > hg > graal-jvmci-8

diff src/share/vm/prims/jni.cpp @ 23404:3ef45d0a6d77

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
author Roland Schatz <roland.schatz@oracle.com>
date Tue, 24 May 2016 13:51:28 +0200
parents 2625b10989ee
children b5f3a471e646
line wrap: on
line diff
--- a/src/share/vm/prims/jni.cpp	Fri May 20 15:49:00 2016 +0200
+++ b/src/share/vm/prims/jni.cpp	Tue May 24 13:51:28 2016 +0200
@@ -5204,15 +5204,17 @@
     *vm = (JavaVM *)(&main_vm);
     *(JNIEnv**)penv = thread->jni_environment();
 
-#ifdef COMPILERJVMCI
-    // JVMCI is initialized on a CompilerThread
-    if (BootstrapJVMCI) {
-      JavaThread* THREAD = thread;
-      JVMCICompiler* compiler = JVMCICompiler::instance(CATCH);
-      compiler->bootstrap(THREAD);
-      if (HAS_PENDING_EXCEPTION) {
-        HandleMark hm;
-        vm_exit_during_initialization(Handle(THREAD, PENDING_EXCEPTION));
+#if INCLUDE_JVMCI
+    if (UseJVMCICompiler) {
+      // JVMCI is initialized on a CompilerThread
+      if (BootstrapJVMCI) {
+        JavaThread* THREAD = thread;
+        JVMCICompiler* compiler = JVMCICompiler::instance(CATCH);
+        compiler->bootstrap(THREAD);
+        if (HAS_PENDING_EXCEPTION) {
+          HandleMark hm;
+          vm_exit_during_initialization(Handle(THREAD, PENDING_EXCEPTION));
+        }
       }
     }
 #endif