*** old/src/share/vm/opto/bytecodeInfo.cpp	Fri Sep 20 16:09:52 2013
--- new/src/share/vm/opto/bytecodeInfo.cpp	Fri Sep 20 16:09:51 2013

*** 121,131 ****
--- 121,131 ----
                                 int caller_bci, ciCallProfile& profile,
                                 WarmCallInfo* wci_result) {
    // Allows targeted inlining
    if(callee_method->should_inline()) {
      *wci_result = *(WarmCallInfo::always_hot());
!     if (PrintInlining && Verbose) {
!     if (C->print_inlining() && Verbose) {
        CompileTask::print_inline_indent(inline_level());
        tty->print_cr("Inlined method is hot: ");
      }
      set_msg("force inline by CompilerOracle");
      return true;

*** 135,145 ****
--- 135,145 ----
  
    // Check for too many throws (and not too huge)
    if(callee_method->interpreter_throwout_count() > InlineThrowCount &&
       size < InlineThrowMaxSize ) {
      wci_result->set_profit(wci_result->profit() * 100);
!     if (PrintInlining && Verbose) {
!     if (C->print_inlining() && Verbose) {
        CompileTask::print_inline_indent(inline_level());
        tty->print_cr("Inlined method with many throws (throws=%d):", callee_method->interpreter_throwout_count());
      }
      set_msg("many throws");
      return true;

*** 489,499 ****
--- 489,499 ----
        C->log()->inline_success(inline_msg);
      } else {
        C->log()->inline_fail(inline_msg);
      }
    }
!   if (PrintInlining) {
!   if (C->print_inlining()) {
      C->print_inlining(callee_method, inline_level(), caller_bci, inline_msg);
      if (callee_method == NULL) tty->print(" callee not monotonic or profiled");
      if (Verbose && callee_method) {
        const InlineTree *top = this;
        while( top->caller_tree() != NULL ) { top = top->caller_tree(); }

*** 538,548 ****
--- 538,548 ----
    bool success = try_to_inline(callee_method, caller_method, caller_bci,
                                 profile, &wci, should_delay);
  
  #ifndef PRODUCT
    if (UseOldInlining && InlineWarmCalls
!       && (PrintOpto || PrintOptoInlining || PrintInlining)) {
!       && (PrintOpto || C->print_inlining())) {
      bool cold = wci.is_cold();
      bool hot  = !cold && wci.is_hot();
      bool old_cold = !success;
      if (old_cold != cold || (Verbose || WizardMode)) {
        if (msg() == NULL) {

*** 615,625 ****
--- 615,625 ----
        max_inline_level_adjust += 1;  // don't count actions in MH or indy adapter frames
      else if (callee_method->is_method_handle_intrinsic() ||
               callee_method->is_compiled_lambda_form()) {
        max_inline_level_adjust += 1;  // don't count method handle calls from java.lang.invoke implem
      }
!     if (max_inline_level_adjust != 0 && PrintInlining && (Verbose || WizardMode)) {
!     if (max_inline_level_adjust != 0 && C->print_inlining() && (Verbose || WizardMode)) {
        CompileTask::print_inline_indent(inline_level());
        tty->print_cr(" \\-> discounting inline depth");
      }
      if (max_inline_level_adjust != 0 && C->log()) {
        int id1 = C->log()->identify(caller_jvms->method());