src/share/vm/opto/stringopts.cpp

*** 239,255 ****
        call->init_req(TypeFunc::Parms, __ intcon(trap_request));
        kit.add_safepoint_edges(call);
  
        _stringopts->gvn()->transform(call);
        C->gvn_replace_by(uct, call);
!       uct->disconnect_inputs(NULL);
      }
    }
  
    void cleanup() {
      // disconnect the hook node
!     _arguments->disconnect_inputs(NULL);
    }
  };
  
  
  void StringConcat::eliminate_unneeded_control() {
--- 239,255 ----
        call->init_req(TypeFunc::Parms, __ intcon(trap_request));
        kit.add_safepoint_edges(call);
  
        _stringopts->gvn()->transform(call);
        C->gvn_replace_by(uct, call);
!       uct->disconnect_inputs(NULL, C);
      }
    }
  
    void cleanup() {
      // disconnect the hook node
!     _arguments->disconnect_inputs(NULL, _stringopts->C);
    }
  };
  
  
  void StringConcat::eliminate_unneeded_control() {
*** 356,366 ****
    if (mem_proj != NULL) {
      Node *mem = init->in(TypeFunc::Memory);
      C->gvn_replace_by(mem_proj, mem);
    }
    C->gvn_replace_by(init, C->top());
!   init->disconnect_inputs(NULL);
  }
  
  Node_List PhaseStringOpts::collect_toString_calls() {
    Node_List string_calls;
    Node_List worklist;
--- 356,366 ----
    if (mem_proj != NULL) {
      Node *mem = init->in(TypeFunc::Memory);
      C->gvn_replace_by(mem_proj, mem);
    }
    C->gvn_replace_by(init, C->top());
!   init->disconnect_inputs(NULL, C);
  }
  
  Node_List PhaseStringOpts::collect_toString_calls() {
    Node_List string_calls;
    Node_List worklist;
*** 1475,1482 ****
  
    // hook up the outgoing control and result
    kit.replace_call(sc->end(), result);
  
    // Unhook any hook nodes
!   string_sizes->disconnect_inputs(NULL);
    sc->cleanup();
  }
--- 1475,1482 ----
  
    // hook up the outgoing control and result
    kit.replace_call(sc->end(), result);
  
    // Unhook any hook nodes
!   string_sizes->disconnect_inputs(NULL, C);
    sc->cleanup();
  }