RFR: 8152134: [JVMCI] printing compile queues always prints C2 regardless of UseJVMCICompiler

[Christian Thalinger]

https://bugs.openjdk.java.net/browse/JDK-8152134 <https://bugs.openjdk.java.net/browse/JDK-8152134>

It should print “JVMCI compile queue”.

diff -r 7c31312c5725 src/share/vm/compiler/compileBroker.cpp
--- a/src/share/vm/compiler/compileBroker.cpp	Thu Mar 17 17:03:20 2016 +0000
+++ b/src/share/vm/compiler/compileBroker.cpp	Thu Mar 17 10:54:08 2016 -1000
@@ -773,7 +773,13 @@ void CompileBroker::init_compiler_sweepe
 #endif // !ZERO && !SHARK
   // Initialize the compilation queue
   if (c2_compiler_count > 0) {
-    _c2_compile_queue  = new CompileQueue("C2 compile queue");
+    const char* name;
+#if INCLUDE_JVMCI
+    name = UseJVMCICompiler ? "JVMCI compile queue" : "C2 compile queue";
+#else
+    name = "C2 compile queue";
+#endif
+    _c2_compile_queue  = new CompileQueue(name);
     _compilers[1]->set_num_compiler_threads(c2_compiler_count);
   }
   if (c1_compiler_count > 0) {

or:

diff -r f2f1b80b0b03 src/share/vm/compiler/compileBroker.cpp
--- a/src/share/vm/compiler/compileBroker.cpp	Thu Mar 17 10:55:15 2016 -1000
+++ b/src/share/vm/compiler/compileBroker.cpp	Thu Mar 17 10:57:12 2016 -1000
@@ -773,7 +773,8 @@ void CompileBroker::init_compiler_sweepe
 #endif // !ZERO && !SHARK
   // Initialize the compilation queue
   if (c2_compiler_count > 0) {
-    _c2_compile_queue  = new CompileQueue("C2 compile queue");
+    const char* name = JVMCI_ONLY(UseJVMCICompiler ? "JVMCI compile queue" :) "C2 compile queue";
+    _c2_compile_queue  = new CompileQueue(name);
     _compilers[1]->set_num_compiler_threads(c2_compiler_count);
   }
   if (c1_compiler_count > 0) {

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/hotspot-compiler-dev/attachments/20160317/bde95b73/attachment.html>