src/hotspot/share/opto/divnode.cpp

@@ -1599,11 +1599,11 @@
   * propagate the input state and replace the result by the said constant.
   */
  TupleNode* ModFloatingNode::make_tuple_of_input_state_and_constant_result(PhaseIterGVN* phase, const Type* con) const {
    Node* con_node = phase->makecon(con);
    TupleNode* tuple = TupleNode::make(
-       tf()->range(),
+       tf()->range_cc(),
        in(TypeFunc::Control),
        in(TypeFunc::I_O),
        in(TypeFunc::Memory),
        in(TypeFunc::FramePtr),
        in(TypeFunc::ReturnAdr),

@@ -1662,11 +1662,11 @@
    return divmod;
  }
  
  //------------------------------match------------------------------------------
  // return result(s) along with their RegMask info
- Node *DivModINode::match( const ProjNode *proj, const Matcher *match ) {
+ Node *DivModINode::match(const ProjNode *proj, const Matcher *match, const RegMask* mask) {
    uint ideal_reg = proj->ideal_reg();
    RegMask rm;
    if (proj->_con == div_proj_num) {
      rm = match->divI_proj_mask();
    } else {

@@ -1677,11 +1677,11 @@
  }
  
  
  //------------------------------match------------------------------------------
  // return result(s) along with their RegMask info
- Node *DivModLNode::match( const ProjNode *proj, const Matcher *match ) {
+ Node *DivModLNode::match(const ProjNode *proj, const Matcher *match, const RegMask* mask) {
    uint ideal_reg = proj->ideal_reg();
    RegMask rm;
    if (proj->_con == div_proj_num) {
      rm = match->divL_proj_mask();
    } else {

@@ -1715,11 +1715,11 @@
    return divmod;
  }
  
  //------------------------------match------------------------------------------
  // return result(s) along with their RegMask info
- Node* UDivModINode::match( const ProjNode *proj, const Matcher *match ) {
+ Node* UDivModINode::match(const ProjNode* proj, const Matcher* match, const RegMask* mask) {
    uint ideal_reg = proj->ideal_reg();
    RegMask rm;
    if (proj->_con == div_proj_num) {
      rm = match->divI_proj_mask();
    } else {

@@ -1730,11 +1730,11 @@
  }
  
  
  //------------------------------match------------------------------------------
  // return result(s) along with their RegMask info
- Node* UDivModLNode::match( const ProjNode *proj, const Matcher *match ) {
+ Node* UDivModLNode::match( const ProjNode* proj, const Matcher* match, const RegMask* mask) {
    uint ideal_reg = proj->ideal_reg();
    RegMask rm;
    if (proj->_con == div_proj_num) {
      rm = match->divL_proj_mask();
    } else {