src/share/vm/opto/library_call.cpp

*** 385,396 ****
    const int bci    = kit.bci();
  
    // Try to inline the intrinsic.
    if ((CheckIntrinsics ? callee->intrinsic_candidate() : true) &&
        kit.try_to_inline(_last_predicate)) {
      if (C->print_intrinsics() || C->print_inlining()) {
!       C->print_inlining(callee, jvms->depth() - 1, bci, is_virtual() ? "(intrinsic, virtual)" : "(intrinsic)");
      }
      C->gather_intrinsic_statistics(intrinsic_id(), is_virtual(), Compile::_intrinsic_worked);
      if (C->log()) {
        C->log()->elem("intrinsic id='%s'%s nodes='%d'",
                       vmIntrinsics::name_at(intrinsic_id()),
--- 385,399 ----
    const int bci    = kit.bci();
  
    // Try to inline the intrinsic.
    if ((CheckIntrinsics ? callee->intrinsic_candidate() : true) &&
        kit.try_to_inline(_last_predicate)) {
+     const char *inline_msg = is_virtual() ? "(intrinsic, virtual)"
+                                           : "(intrinsic)";
+     CompileTask::print_inlining_ul(callee, jvms->depth() - 1, bci, inline_msg);
      if (C->print_intrinsics() || C->print_inlining()) {
!       C->print_inlining(callee, jvms->depth() - 1, bci, inline_msg);
      }
      C->gather_intrinsic_statistics(intrinsic_id(), is_virtual(), Compile::_intrinsic_worked);
      if (C->log()) {
        C->log()->elem("intrinsic id='%s'%s nodes='%d'",
                       vmIntrinsics::name_at(intrinsic_id()),
*** 402,427 ****
      C->print_inlining_update(this);
      return kit.transfer_exceptions_into_jvms();
    }
  
    // The intrinsic bailed out
-   if (C->print_intrinsics() || C->print_inlining()) {
      if (jvms->has_method()) {
        // Not a root compile.
        const char* msg;
        if (callee->intrinsic_candidate()) {
          msg = is_virtual() ? "failed to inline (intrinsic, virtual)" : "failed to inline (intrinsic)";
        } else {
          msg = is_virtual() ? "failed to inline (intrinsic, virtual), method not annotated"
                             : "failed to inline (intrinsic), method not annotated";
        }
        C->print_inlining(callee, jvms->depth() - 1, bci, msg);
      } else {
        // Root compile
!       tty->print("Did not generate intrinsic %s%s at bci:%d in",
                 vmIntrinsics::name_at(intrinsic_id()),
!                (is_virtual() ? " (virtual)" : ""), bci);
      }
    }
    C->gather_intrinsic_statistics(intrinsic_id(), is_virtual(), Compile::_intrinsic_failed);
    C->print_inlining_update(this);
    return NULL;
--- 405,438 ----
      C->print_inlining_update(this);
      return kit.transfer_exceptions_into_jvms();
    }
  
    // The intrinsic bailed out
    if (jvms->has_method()) {
      // Not a root compile.
      const char* msg;
      if (callee->intrinsic_candidate()) {
        msg = is_virtual() ? "failed to inline (intrinsic, virtual)" : "failed to inline (intrinsic)";
      } else {
        msg = is_virtual() ? "failed to inline (intrinsic, virtual), method not annotated"
                           : "failed to inline (intrinsic), method not annotated";
      }
+     CompileTask::print_inlining_ul(callee, jvms->depth() - 1, bci, msg);
+     if (C->print_intrinsics() || C->print_inlining()) {
        C->print_inlining(callee, jvms->depth() - 1, bci, msg);
+     }
    } else {
      // Root compile
!     ResourceMark rm;
!     stringStream msg_stream;
!     msg_stream.print("Did not generate intrinsic %s%s at bci:%d in",
                       vmIntrinsics::name_at(intrinsic_id()),
!                      is_virtual() ? " (virtual)" : "", bci);
!     const char *msg = msg_stream.as_string();
!     log_debug(jit, inlining)("%s", msg);
!     if (C->print_intrinsics() || C->print_inlining()) {
!       tty->print("%s", msg);
      }
    }
    C->gather_intrinsic_statistics(intrinsic_id(), is_virtual(), Compile::_intrinsic_failed);
    C->print_inlining_update(this);
    return NULL;
*** 443,454 ****
    ciMethod* callee = kit.callee();
    const int bci    = kit.bci();
  
    Node* slow_ctl = kit.try_to_predicate(predicate);
    if (!kit.failing()) {
      if (C->print_intrinsics() || C->print_inlining()) {
!       C->print_inlining(callee, jvms->depth() - 1, bci, is_virtual() ? "(intrinsic, virtual, predicate)" : "(intrinsic, predicate)");
      }
      C->gather_intrinsic_statistics(intrinsic_id(), is_virtual(), Compile::_intrinsic_worked);
      if (C->log()) {
        C->log()->elem("predicate_intrinsic id='%s'%s nodes='%d'",
                       vmIntrinsics::name_at(intrinsic_id()),
--- 454,468 ----
    ciMethod* callee = kit.callee();
    const int bci    = kit.bci();
  
    Node* slow_ctl = kit.try_to_predicate(predicate);
    if (!kit.failing()) {
+     const char *inline_msg = is_virtual() ? "(intrinsic, virtual, predicate)"
+                                           : "(intrinsic, predicate)";
+     CompileTask::print_inlining_ul(callee, jvms->depth() - 1, bci, inline_msg);
      if (C->print_intrinsics() || C->print_inlining()) {
!       C->print_inlining(callee, jvms->depth() - 1, bci, inline_msg);
      }
      C->gather_intrinsic_statistics(intrinsic_id(), is_virtual(), Compile::_intrinsic_worked);
      if (C->log()) {
        C->log()->elem("predicate_intrinsic id='%s'%s nodes='%d'",
                       vmIntrinsics::name_at(intrinsic_id()),
*** 457,476 ****
      }
      return slow_ctl; // Could be NULL if the check folds.
    }
  
    // The intrinsic bailed out
-   if (C->print_intrinsics() || C->print_inlining()) {
      if (jvms->has_method()) {
        // Not a root compile.
        const char* msg = "failed to generate predicate for intrinsic";
        C->print_inlining(kit.callee(), jvms->depth() - 1, bci, msg);
      } else {
        // Root compile
!       C->print_inlining_stream()->print("Did not generate predicate for intrinsic %s%s at bci:%d in",
                                          vmIntrinsics::name_at(intrinsic_id()),
!                                         (is_virtual() ? " (virtual)" : ""), bci);
      }
    }
    C->gather_intrinsic_statistics(intrinsic_id(), is_virtual(), Compile::_intrinsic_failed);
    return NULL;
  }
--- 471,498 ----
      }
      return slow_ctl; // Could be NULL if the check folds.
    }
  
    // The intrinsic bailed out
    if (jvms->has_method()) {
      // Not a root compile.
      const char* msg = "failed to generate predicate for intrinsic";
+     CompileTask::print_inlining_ul(kit.callee(), jvms->depth() - 1, bci, msg);
+     if (C->print_intrinsics() || C->print_inlining()) {
        C->print_inlining(kit.callee(), jvms->depth() - 1, bci, msg);
+     }
    } else {
      // Root compile
!     ResourceMark rm;
!     stringStream msg_stream;
!     msg_stream.print("Did not generate intrinsic %s%s at bci:%d in",
                       vmIntrinsics::name_at(intrinsic_id()),
!                      is_virtual() ? " (virtual)" : "", bci);
!     const char *msg = msg_stream.as_string();
!     log_debug(jit, inlining)("%s", msg);
!     if (C->print_intrinsics() || C->print_inlining()) {
!       C->print_inlining_stream()->print("%s", msg);
      }
    }
    C->gather_intrinsic_statistics(intrinsic_id(), is_virtual(), Compile::_intrinsic_failed);
    return NULL;
  }