src/share/vm/opto/compile.cpp

rev 5783 : 8024069: replace_in_map() should operate on parent maps
Summary: type information gets lost because replace_in_map() doesn't update parent maps
Reviewed-by: kvn, twisti
rev 5784 : 8026796: Make replace_in_map() on parent maps generic
Summary: propagate node replacements along control flow edges to callers
Reviewed-by: kvn, vlivanov

*** 397,406 ****
--- 397,411 ----
  // Disconnect all useless nodes by disconnecting those at the boundary.
  void Compile::remove_useless_nodes(Unique_Node_List &useful) {
    uint next = 0;
    while (next < useful.size()) {
      Node *n = useful.at(next++);
+     if (n->is_SafePoint()) {
+       // We're done with a parsing phase. Replaced nodes are not valid
+       // beyond that point.
+       n->as_SafePoint()->delete_replaced_nodes();
+     }
      // Use raw traversal of out edges since this code removes out edges
      int max = n->outcnt();
      for (int j = 0; j < max; ++j) {
        Node* child = n->raw_out(j);
        if (! useful.member(child)) {
*** 1893,1904 ****
    while(inlining_progress() && _late_inlines.length() > 0) {
  
      if (live_nodes() > (uint)LiveNodeCountInliningCutoff) {
        if (low_live_nodes < (uint)LiveNodeCountInliningCutoff * 8 / 10) {
          // PhaseIdealLoop is expensive so we only try it once we are
!         // out of loop and we only try it again if the previous helped
!         // got the number of nodes down significantly
          PhaseIdealLoop ideal_loop( igvn, false, true );
          if (failing())  return;
          low_live_nodes = live_nodes();
          _major_progress = true;
        }
--- 1898,1909 ----
    while(inlining_progress() && _late_inlines.length() > 0) {
  
      if (live_nodes() > (uint)LiveNodeCountInliningCutoff) {
        if (low_live_nodes < (uint)LiveNodeCountInliningCutoff * 8 / 10) {
          // PhaseIdealLoop is expensive so we only try it once we are
!         // out of live nodes and we only try it again if the previous
!         // helped got the number of nodes down significantly
          PhaseIdealLoop ideal_loop( igvn, false, true );
          if (failing())  return;
          low_live_nodes = live_nodes();
          _major_progress = true;
        }