src/share/vm/opto/callGenerator.cpp

*** 150,160 ****
      }
      // Mark the call node as virtual, sort of:
      call->set_optimized_virtual(true);
      if (method()->is_method_handle_invoke()) {
        call->set_method_handle_invoke(true);
-       kit.C->set_has_method_handle_invokes(true);
      }
    }
    kit.set_arguments_for_java_call(call);
    kit.set_edges_for_java_call(call, false, _separate_io_proj);
    Node* ret = kit.set_results_for_java_call(call, _separate_io_proj);
--- 150,159 ----
*** 208,218 ****
    CallStaticJavaNode *call = new (kit.C, tf()->domain()->cnt()) CallStaticJavaNode(tf(), resolve_stub, method(), kit.bci());
    // invokedynamic is treated as an optimized invokevirtual.
    call->set_optimized_virtual(true);
    // Take extra care (in the presence of argument motion) not to trash the SP:
    call->set_method_handle_invoke(true);
-   kit.C->set_has_method_handle_invokes(true);
  
    // Pass the target MethodHandle as first argument and shift the
    // other arguments.
    call->init_req(0 + TypeFunc::Parms, target_mh);
    uint nargs = call->method()->arg_size();
--- 207,216 ----
*** 719,740 ****
        if (cg != NULL && cg->is_inline())
          return cg;
      }
    } else if (method_handle->Opcode() == Op_Phi && method_handle->req() == 3 &&
               method_handle->in(1)->Opcode() == Op_ConP && method_handle->in(2)->Opcode() == Op_ConP) {
      // selectAlternative idiom merging two constant MethodHandles.
      // Generate a guard so that each can be inlined.  We might want to
      // do more inputs at later point but this gets the most common
      // case.
      const TypeOopPtr* oop_ptr = method_handle->in(1)->bottom_type()->is_oopptr();
      ciObject* const_oop = oop_ptr->const_oop();
      ciMethodHandle* mh = const_oop->as_method_handle();
! 
!     CallGenerator* cg1 = for_method_handle_inline(method_handle->in(1), jvms, caller, callee, profile);
!     CallGenerator* cg2 = for_method_handle_inline(method_handle->in(2), jvms, caller, callee, profile);
!     if (cg1 != NULL && cg2 != NULL) {
!       return new PredictedDynamicCallGenerator(mh, cg2, cg1, PROB_FAIR);
      }
    }
    return NULL;
  }
  
--- 717,750 ----
        if (cg != NULL && cg->is_inline())
          return cg;
      }
    } else if (method_handle->Opcode() == Op_Phi && method_handle->req() == 3 &&
               method_handle->in(1)->Opcode() == Op_ConP && method_handle->in(2)->Opcode() == Op_ConP) {
+     float prob = PROB_FAIR;
+     Node* meth_region = method_handle->in(0);
+     if (meth_region->is_Region() &&
+         meth_region->in(1)->is_Proj() && meth_region->in(2)->is_Proj() &&
+         meth_region->in(1)->in(0) == meth_region->in(2)->in(0) &&
+         meth_region->in(1)->in(0)->is_If()) {
+       // If diamond, so grab the probability of the test to drive the inlining below
+       prob = meth_region->in(1)->in(0)->as_If()->_prob;
+       if (meth_region->in(1)->is_IfTrue()) {
+         prob = 1 - prob;
+       }
+     }
+ 
      // selectAlternative idiom merging two constant MethodHandles.
      // Generate a guard so that each can be inlined.  We might want to
      // do more inputs at later point but this gets the most common
      // case.
+     CallGenerator* cg1 = for_method_handle_inline(method_handle->in(1), jvms, caller, callee, profile.rescale(1.0 - prob));
+     CallGenerator* cg2 = for_method_handle_inline(method_handle->in(2), jvms, caller, callee, profile.rescale(prob));
+     if (cg1 != NULL && cg2 != NULL) {
        const TypeOopPtr* oop_ptr = method_handle->in(1)->bottom_type()->is_oopptr();
        ciObject* const_oop = oop_ptr->const_oop();
        ciMethodHandle* mh = const_oop->as_method_handle();
!       return new PredictedDynamicCallGenerator(mh, cg2, cg1, prob);
      }
    }
    return NULL;
  }