src/share/vm/opto/bytecodeInfo.cpp

rev 12109 : 8167656: Unstable MethodHandle inlining causing huge performance variations
Summary: Don't forbid inlining of method handles without type profile
Reviewed-by:

*** 321,331 ****
  //-----------------------------try_to_inline-----------------------------------
  // return true if ok
  // Relocated from "InliningClosure::try_to_inline"
  bool InlineTree::try_to_inline(ciMethod* callee_method, ciMethod* caller_method,
                                 int caller_bci, JVMState* jvms, ciCallProfile& profile,
!                                WarmCallInfo* wci_result, bool& should_delay) {
  
    if (ClipInlining && (int)count_inline_bcs() >= DesiredMethodLimit) {
      if (!callee_method->force_inline() || !IncrementalInline) {
        set_msg("size > DesiredMethodLimit");
        return false;
--- 321,331 ----
  //-----------------------------try_to_inline-----------------------------------
  // return true if ok
  // Relocated from "InliningClosure::try_to_inline"
  bool InlineTree::try_to_inline(ciMethod* callee_method, ciMethod* caller_method,
                                 int caller_bci, JVMState* jvms, ciCallProfile& profile,
!                                WarmCallInfo* wci_result, bool& should_delay, bool is_mh_inline) {
  
    if (ClipInlining && (int)count_inline_bcs() >= DesiredMethodLimit) {
      if (!callee_method->force_inline() || !IncrementalInline) {
        set_msg("size > DesiredMethodLimit");
        return false;
*** 365,375 ****
  
      if ((!UseInterpreter || CompileTheWorld) &&
          is_init_with_ea(callee_method, caller_method, C)) {
        // Escape Analysis stress testing when running Xcomp or CTW:
        // inline constructors even if they are not reached.
!     } else if (forced_inline()) {
        // Inlining was forced by CompilerOracle, ciReplay or annotation
      } else if (profile.count() == 0) {
        // don't inline unreached call sites
         set_msg("call site not reached");
         return false;
--- 365,375 ----
  
      if ((!UseInterpreter || CompileTheWorld) &&
          is_init_with_ea(callee_method, caller_method, C)) {
        // Escape Analysis stress testing when running Xcomp or CTW:
        // inline constructors even if they are not reached.
!     } else if (forced_inline() || is_mh_inline) {
        // Inlining was forced by CompilerOracle, ciReplay or annotation
      } else if (profile.count() == 0) {
        // don't inline unreached call sites
         set_msg("call site not reached");
         return false;
*** 518,528 ****
    }
  #endif // INCLUDE_TRACE
  }
  
  //------------------------------ok_to_inline-----------------------------------
! WarmCallInfo* InlineTree::ok_to_inline(ciMethod* callee_method, JVMState* jvms, ciCallProfile& profile, WarmCallInfo* initial_wci, bool& should_delay) {
    assert(callee_method != NULL, "caller checks for optimized virtual!");
    assert(!should_delay, "should be initialized to false");
  #ifdef ASSERT
    // Make sure the incoming jvms has the same information content as me.
    // This means that we can eventually make this whole class AllStatic.
--- 518,528 ----
    }
  #endif // INCLUDE_TRACE
  }
  
  //------------------------------ok_to_inline-----------------------------------
! WarmCallInfo* InlineTree::ok_to_inline(ciMethod* callee_method, JVMState* jvms, ciCallProfile& profile, WarmCallInfo* initial_wci, bool& should_delay, bool is_mh_inline) {
    assert(callee_method != NULL, "caller checks for optimized virtual!");
    assert(!should_delay, "should be initialized to false");
  #ifdef ASSERT
    // Make sure the incoming jvms has the same information content as me.
    // This means that we can eventually make this whole class AllStatic.
*** 551,561 ****
    }
  
    // Check if inlining policy says no.
    WarmCallInfo wci = *(initial_wci);
    bool success = try_to_inline(callee_method, caller_method, caller_bci,
!                                jvms, profile, &wci, should_delay);
  
  #ifndef PRODUCT
    if (InlineWarmCalls && (PrintOpto || C->print_inlining())) {
      bool cold = wci.is_cold();
      bool hot  = !cold && wci.is_hot();
--- 551,561 ----
    }
  
    // Check if inlining policy says no.
    WarmCallInfo wci = *(initial_wci);
    bool success = try_to_inline(callee_method, caller_method, caller_bci,
!                                jvms, profile, &wci, should_delay, is_mh_inline);
  
  #ifndef PRODUCT
    if (InlineWarmCalls && (PrintOpto || C->print_inlining())) {
      bool cold = wci.is_cold();
      bool hot  = !cold && wci.is_hot();