src/share/vm/opto/graphKit.hpp

*** 307,341 ****
    }
    Node* basic_plus_adr(Node* base, Node* ptr, Node* offset);
  
  
    // Some convenient shortcuts for common nodes
!   Node* IfTrue(IfNode* iff)                   { return _gvn.transform(new (C) IfTrueNode(iff));      }
!   Node* IfFalse(IfNode* iff)                  { return _gvn.transform(new (C) IfFalseNode(iff));     }
  
!   Node* AddI(Node* l, Node* r)                { return _gvn.transform(new (C) AddINode(l, r));       }
!   Node* SubI(Node* l, Node* r)                { return _gvn.transform(new (C) SubINode(l, r));       }
!   Node* MulI(Node* l, Node* r)                { return _gvn.transform(new (C) MulINode(l, r));       }
!   Node* DivI(Node* ctl, Node* l, Node* r)     { return _gvn.transform(new (C) DivINode(ctl, l, r));  }
! 
!   Node* AndI(Node* l, Node* r)                { return _gvn.transform(new (C) AndINode(l, r));       }
!   Node* OrI(Node* l, Node* r)                 { return _gvn.transform(new (C) OrINode(l, r));        }
!   Node* XorI(Node* l, Node* r)                { return _gvn.transform(new (C) XorINode(l, r));       }
! 
!   Node* MaxI(Node* l, Node* r)                { return _gvn.transform(new (C) MaxINode(l, r));       }
!   Node* MinI(Node* l, Node* r)                { return _gvn.transform(new (C) MinINode(l, r));       }
! 
!   Node* LShiftI(Node* l, Node* r)             { return _gvn.transform(new (C) LShiftINode(l, r));    }
!   Node* RShiftI(Node* l, Node* r)             { return _gvn.transform(new (C) RShiftINode(l, r));    }
!   Node* URShiftI(Node* l, Node* r)            { return _gvn.transform(new (C) URShiftINode(l, r));   }
! 
!   Node* CmpI(Node* l, Node* r)                { return _gvn.transform(new (C) CmpINode(l, r));       }
!   Node* CmpL(Node* l, Node* r)                { return _gvn.transform(new (C) CmpLNode(l, r));       }
!   Node* CmpP(Node* l, Node* r)                { return _gvn.transform(new (C) CmpPNode(l, r));       }
!   Node* Bool(Node* cmp, BoolTest::mask relop) { return _gvn.transform(new (C) BoolNode(cmp, relop)); }
  
!   Node* AddP(Node* b, Node* a, Node* o)       { return _gvn.transform(new (C) AddPNode(b, a, o));    }
  
    // Convert between int and long, and size_t.
    // (See macros ConvI2X, etc., in type.hpp for ConvI2X, etc.)
    Node* ConvI2L(Node* offset);
    Node* ConvI2UL(Node* offset);
--- 307,341 ----
    }
    Node* basic_plus_adr(Node* base, Node* ptr, Node* offset);
  
  
    // Some convenient shortcuts for common nodes
!   Node* IfTrue(IfNode* iff)                   { return _gvn.transform(new IfTrueNode(iff));      }
!   Node* IfFalse(IfNode* iff)                  { return _gvn.transform(new IfFalseNode(iff));     }
  
!   Node* AddI(Node* l, Node* r)                { return _gvn.transform(new AddINode(l, r));       }
!   Node* SubI(Node* l, Node* r)                { return _gvn.transform(new SubINode(l, r));       }
!   Node* MulI(Node* l, Node* r)                { return _gvn.transform(new MulINode(l, r));       }
!   Node* DivI(Node* ctl, Node* l, Node* r)     { return _gvn.transform(new DivINode(ctl, l, r));  }
! 
!   Node* AndI(Node* l, Node* r)                { return _gvn.transform(new AndINode(l, r));       }
!   Node* OrI(Node* l, Node* r)                 { return _gvn.transform(new OrINode(l, r));        }
!   Node* XorI(Node* l, Node* r)                { return _gvn.transform(new XorINode(l, r));       }
! 
!   Node* MaxI(Node* l, Node* r)                { return _gvn.transform(new MaxINode(l, r));       }
!   Node* MinI(Node* l, Node* r)                { return _gvn.transform(new MinINode(l, r));       }
! 
!   Node* LShiftI(Node* l, Node* r)             { return _gvn.transform(new LShiftINode(l, r));    }
!   Node* RShiftI(Node* l, Node* r)             { return _gvn.transform(new RShiftINode(l, r));    }
!   Node* URShiftI(Node* l, Node* r)            { return _gvn.transform(new URShiftINode(l, r));   }
! 
!   Node* CmpI(Node* l, Node* r)                { return _gvn.transform(new CmpINode(l, r));       }
!   Node* CmpL(Node* l, Node* r)                { return _gvn.transform(new CmpLNode(l, r));       }
!   Node* CmpP(Node* l, Node* r)                { return _gvn.transform(new CmpPNode(l, r));       }
!   Node* Bool(Node* cmp, BoolTest::mask relop) { return _gvn.transform(new BoolNode(cmp, relop)); }
  
!   Node* AddP(Node* b, Node* a, Node* o)       { return _gvn.transform(new AddPNode(b, a, o));    }
  
    // Convert between int and long, and size_t.
    // (See macros ConvI2X, etc., in type.hpp for ConvI2X, etc.)
    Node* ConvI2L(Node* offset);
    Node* ConvI2UL(Node* offset);
*** 865,883 ****
    void store_String_length(Node* ctrl, Node* str, Node* value);
    void store_String_value(Node* ctrl, Node* str, Node* value);
  
    // Handy for making control flow
    IfNode* create_and_map_if(Node* ctrl, Node* tst, float prob, float cnt) {
!     IfNode* iff = new (C) IfNode(ctrl, tst, prob, cnt);// New IfNode's
      _gvn.set_type(iff, iff->Value(&_gvn)); // Value may be known at parse-time
      // Place 'if' on worklist if it will be in graph
      if (!tst->is_Con())  record_for_igvn(iff);     // Range-check and Null-check removal is later
      return iff;
    }
  
    IfNode* create_and_xform_if(Node* ctrl, Node* tst, float prob, float cnt) {
!     IfNode* iff = new (C) IfNode(ctrl, tst, prob, cnt);// New IfNode's
      _gvn.transform(iff);                           // Value may be known at parse-time
      // Place 'if' on worklist if it will be in graph
      if (!tst->is_Con())  record_for_igvn(iff);     // Range-check and Null-check removal is later
      return iff;
    }
--- 865,883 ----
    void store_String_length(Node* ctrl, Node* str, Node* value);
    void store_String_value(Node* ctrl, Node* str, Node* value);
  
    // Handy for making control flow
    IfNode* create_and_map_if(Node* ctrl, Node* tst, float prob, float cnt) {
!     IfNode* iff = new IfNode(ctrl, tst, prob, cnt);// New IfNode's
      _gvn.set_type(iff, iff->Value(&_gvn)); // Value may be known at parse-time
      // Place 'if' on worklist if it will be in graph
      if (!tst->is_Con())  record_for_igvn(iff);     // Range-check and Null-check removal is later
      return iff;
    }
  
    IfNode* create_and_xform_if(Node* ctrl, Node* tst, float prob, float cnt) {
!     IfNode* iff = new IfNode(ctrl, tst, prob, cnt);// New IfNode's
      _gvn.transform(iff);                           // Value may be known at parse-time
      // Place 'if' on worklist if it will be in graph
      if (!tst->is_Con())  record_for_igvn(iff);     // Range-check and Null-check removal is later
      return iff;
    }