# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1398851293 -7200
# Node ID e20a45d17181de2f5cadbdb78459b113f9611fff
# Parent  49a917f9fa073973109052d62671c922af3c86cf
Move CIPrintCompilerName handling into CompileTask::print_compilation_impl

diff -r 49a917f9fa07 -r e20a45d17181 src/share/vm/code/nmethod.cpp
--- a/src/share/vm/code/nmethod.cpp	Sun May 04 16:12:44 2014 +0200
+++ b/src/share/vm/code/nmethod.cpp	Wed Apr 30 11:48:13 2014 +0200
@@ -1064,7 +1064,6 @@
 void nmethod::print_on(outputStream* st, const char* msg) const {
   if (st != NULL) {
     ttyLocker ttyl;
-    if (CIPrintCompilerName) st->print("%s:", compiler()->name());
     if (WizardMode) {
       CompileTask::print_compilation(st, this, msg, /*short_form:*/ true);
       st->print_cr(" (" INTPTR_FORMAT ")", this);
diff -r 49a917f9fa07 -r e20a45d17181 src/share/vm/compiler/compileBroker.cpp
--- a/src/share/vm/compiler/compileBroker.cpp	Sun May 04 16:12:44 2014 +0200
+++ b/src/share/vm/compiler/compileBroker.cpp	Wed Apr 30 11:48:13 2014 +0200
@@ -370,8 +370,6 @@
 // CompileTask::print_line
 void CompileTask::print_line() {
   ttyLocker ttyl;  // keep the following output all in one block
-  // print compiler name if requested
-  if (CIPrintCompilerName) tty->print("%s:", CompileBroker::compiler_name(comp_level()));
   print_compilation();
 }
 
@@ -384,6 +382,8 @@
   if (!short_form) {
     st->print("%7d ", (int) st->time_stamp().milliseconds());  // print timestamp
   }
+  // print compiler name if requested
+  if (CIPrintCompilerName) tty->print("%s:", CompileBroker::compiler_name(comp_level));
   st->print("%4d ", compile_id);    // print compilation number
 
   // For unloaded methods the transition to zombie occurs after the