src/share/vm/opto/doCall.cpp

rev 6519 : 8026796: Make replace_in_map() on parent maps generic
Summary: propagate node replacements along control flow edges to callers
Reviewed-by:

*** 523,533 ****
  
    // Bump method data counters (We profile *before* the call is made
    // because exceptions don't return to the call site.)
    profile_call(receiver);
  
!   JVMState* new_jvms = cg->generate(jvms, this);
    if (new_jvms == NULL) {
      // When inlining attempt fails (e.g., too many arguments),
      // it may contaminate the current compile state, making it
      // impossible to pull back and try again.  Once we call
      // cg->generate(), we are committed.  If it fails, the whole
--- 523,533 ----
  
    // Bump method data counters (We profile *before* the call is made
    // because exceptions don't return to the call site.)
    profile_call(receiver);
  
!   JVMState* new_jvms = cg->generate(jvms);
    if (new_jvms == NULL) {
      // When inlining attempt fails (e.g., too many arguments),
      // it may contaminate the current compile state, making it
      // impossible to pull back and try again.  Once we call
      // cg->generate(), we are committed.  If it fails, the whole
*** 537,547 ****
      // This can happen if a library intrinsic is available, but refuses
      // the call site, perhaps because it did not match a pattern the
      // intrinsic was expecting to optimize. Should always be possible to
      // get a normal java call that may inline in that case
      cg = C->call_generator(cg->method(), vtable_index, call_does_dispatch, jvms, try_inline, prof_factor(), speculative_receiver_type, /* allow_intrinsics= */ false);
!     new_jvms = cg->generate(jvms, this);
      if (new_jvms == NULL) {
        guarantee(failing(), "call failed to generate:  calls should work");
        return;
      }
    }
--- 537,547 ----
      // This can happen if a library intrinsic is available, but refuses
      // the call site, perhaps because it did not match a pattern the
      // intrinsic was expecting to optimize. Should always be possible to
      // get a normal java call that may inline in that case
      cg = C->call_generator(cg->method(), vtable_index, call_does_dispatch, jvms, try_inline, prof_factor(), speculative_receiver_type, /* allow_intrinsics= */ false);
!     new_jvms = cg->generate(jvms);
      if (new_jvms == NULL) {
        guarantee(failing(), "call failed to generate:  calls should work");
        return;
      }
    }