Mercurial > hg > graal-jvmci-8

comparison 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
comparison
equal deleted inserted replaced
23403:5342deb9bf53 23404:3ef45d0a6d77
5202 JavaThread *thread = JavaThread::current(); 5202 JavaThread *thread = JavaThread::current();
5203 /* thread is thread_in_vm here */ 5203 /* thread is thread_in_vm here */
5204 *vm = (JavaVM *)(&main_vm); 5204 *vm = (JavaVM *)(&main_vm);
5205 *(JNIEnv**)penv = thread->jni_environment(); 5205 *(JNIEnv**)penv = thread->jni_environment();
5206 5206
5207 #ifdef COMPILERJVMCI 5207 #if INCLUDE_JVMCI
5208 // JVMCI is initialized on a CompilerThread 5208 if (UseJVMCICompiler) {
5209 if (BootstrapJVMCI) { 5209 // JVMCI is initialized on a CompilerThread
5210 JavaThread* THREAD = thread; 5210 if (BootstrapJVMCI) {
5211 JVMCICompiler* compiler = JVMCICompiler::instance(CATCH); 5211 JavaThread* THREAD = thread;
5212 compiler->bootstrap(THREAD); 5212 JVMCICompiler* compiler = JVMCICompiler::instance(CATCH);
5213 if (HAS_PENDING_EXCEPTION) { 5213 compiler->bootstrap(THREAD);
5214 HandleMark hm; 5214 if (HAS_PENDING_EXCEPTION) {
5215 vm_exit_during_initialization(Handle(THREAD, PENDING_EXCEPTION)); 5215 HandleMark hm;
5216 vm_exit_during_initialization(Handle(THREAD, PENDING_EXCEPTION));
5217 }
5216 } 5218 }
5217 } 5219 }
5218 #endif 5220 #endif
5219 5221
5220 // Tracks the time application was running before GC 5222 // Tracks the time application was running before GC