Mercurial > hg > graal-jvmci-8
diff src/share/vm/runtime/thread.cpp @ 23404:3ef45d0a6d77
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 | 24505bf61633 |
| children | b5f3a471e646 |
line wrap: on
line diff
--- a/src/share/vm/runtime/thread.cpp Fri May 20 15:49:00 2016 +0200 +++ b/src/share/vm/runtime/thread.cpp Tue May 24 13:51:28 2016 +0200 @@ -3308,11 +3308,11 @@ #endif } -#ifdef COMPILERJVMCI +#if INCLUDE_JVMCI bool CompilerThread::can_call_java() const { return _compiler != NULL && _compiler->is_jvmci(); } -#endif +#endif // INCLUDE_JVMCI void CompilerThread::oops_do(OopClosure* f, CLDClosure* cld_f, CodeBlobClosure* cf) { JavaThread::oops_do(f, cld_f, cf); @@ -3710,7 +3710,7 @@ } // initialize compiler(s) -#if defined(COMPILER1) || defined(COMPILER2) || defined(SHARK) || defined(COMPILERJVMCI) +#if defined(COMPILER1) || defined(COMPILER2) || defined(SHARK) || INCLUDE_JVMCI CompileBroker::compilation_init(THREAD); if (HAS_PENDING_EXCEPTION) { vm_exit_during_initialization(Handle(THREAD, PENDING_EXCEPTION));