Mercurial > hg > graal-jvmci-8

diff src/share/vm/runtime/compilationPolicy.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 7ae6a635fad0
children
line wrap: on
line diff
--- a/src/share/vm/runtime/compilationPolicy.cpp	Fri May 20 15:49:00 2016 +0200
+++ b/src/share/vm/runtime/compilationPolicy.cpp	Tue May 24 13:51:28 2016 +0200
@@ -188,8 +188,8 @@
 }
 
 CompileTask* CompilationPolicy::select_task_helper(CompileQueue* compile_queue) {
-#ifdef COMPILERJVMCI
-  if (!BackgroundCompilation) {
+#if INCLUDE_JVMCI
+  if (UseJVMCICompiler && !BackgroundCompilation) {
     /*
      * In blocking compilation mode, the CompileBroker will make
      * compilations submitted by a JVMCI compiler thread non-blocking. These
@@ -247,7 +247,7 @@
 // - if neither is defined - always return zero.
 int NonTieredCompPolicy::compiler_count(CompLevel comp_level) {
   assert(!TieredCompilation, "This policy should not be used with TieredCompilation");
-#if defined(COMPILER2) || defined(COMPILERJVMCI)
+#ifdef COMPILER2
   if (is_c2_compile(comp_level)) {
     return _compiler_count;
   } else {