*** old/src/share/vm/compiler/compileBroker.cpp	Tue Apr 29 16:52:39 2014
--- new/src/share/vm/compiler/compileBroker.cpp	Tue Apr 29 16:52:39 2014

*** 171,181 ****
--- 171,181 ----
    }
  
    void log_nmethod(JavaThread* thread, nmethod* nm) {
      log(thread, "nmethod %d%s " INTPTR_FORMAT " code ["INTPTR_FORMAT ", " INTPTR_FORMAT "]",
          nm->compile_id(), nm->is_osr_method() ? "%" : "",
!         nm, nm->code_begin(), nm->code_end());
!         p2i(nm), p2i(nm->code_begin()), p2i(nm->code_end()));
    }
  
    void log_failure(JavaThread* thread, CompileTask* task, const char* reason, const char* retry_message) {
      StringLogMessage lm;
      lm.print("%4d   COMPILE SKIPPED: %s", task->compile_id(), reason);

*** 1787,1797 ****
--- 1787,1797 ----
  // Call this from the compiler at convenient points, to poll for _should_block.
  void CompileBroker::maybe_block() {
    if (_should_block) {
  #ifndef PRODUCT
      if (PrintCompilation && (Verbose || WizardMode))
!       tty->print_cr("compiler thread " INTPTR_FORMAT " poll detects block request", p2i(Thread::current()));
  #endif
      ThreadInVMfromNative tivfn(JavaThread::current());
    }
  }
  

*** 1804,1814 ****
--- 1804,1814 ----
    {
      MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
      CodeCache::print_summary(&s, detailed);
    }
    ttyLocker ttyl;
!   tty->print_raw(s.as_string());
  }
  
  // ------------------------------------------------------------------
  // CompileBroker::invoke_compiler_on_method
  //

*** 2009,2019 ****
--- 2009,2019 ----
        // because log_state() will use locks causing lock conflicts.
        CodeCache::log_state(&s);
        // Lock to prevent tearing
        ttyLocker ttyl;
        xtty->begin_elem("code_cache_full");
!       xtty->print_raw(s.as_string());
        xtty->stamp();
        xtty->end_elem();
      }
  
      CodeCache::report_codemem_full();