src/share/vm/opto/memnode.hpp

*** 744,762 ****
  //------------------------------StrComp-------------------------------------
  class StrCompNode: public Node {
  public:
    StrCompNode(Node *control,
                Node* char_array_mem,
!               Node* value_mem,
!               Node* count_mem,
!               Node* offset_mem,
!               Node* s1, Node* s2): Node(control,
                                          char_array_mem,
!                                         value_mem,
!                                         count_mem,
!                                         offset_mem,
!                                         s1, s2) {};
    virtual int Opcode() const;
    virtual bool depends_only_on_test() const { return false; }
    virtual const Type* bottom_type() const { return TypeInt::INT; }
    // a StrCompNode (conservatively) aliases with everything:
    virtual const TypePtr* adr_type() const { return TypePtr::BOTTOM; }
--- 744,758 ----
  //------------------------------StrComp-------------------------------------
  class StrCompNode: public Node {
  public:
    StrCompNode(Node *control,
                   Node* char_array_mem,
!                  Node* s1, Node* s2,
!                  Node* c1, Node* c2): Node(control,
                                             char_array_mem,
!                                            s1, s2,
!                                            c1, c2) {};
    virtual int Opcode() const;
    virtual bool depends_only_on_test() const { return false; }
    virtual const Type* bottom_type() const { return TypeInt::INT; }
    // a StrCompNode (conservatively) aliases with everything:
    virtual const TypePtr* adr_type() const { return TypePtr::BOTTOM; }
*** 768,786 ****
  //------------------------------StrEquals-------------------------------------
  class StrEqualsNode: public Node {
  public:
    StrEqualsNode(Node *control,
                  Node* char_array_mem,
!                 Node* value_mem,
!                 Node* count_mem,
!                 Node* offset_mem,
!                 Node* s1, Node* s2): Node(control,
                                            char_array_mem,
!                                           value_mem,
!                                           count_mem,
!                                           offset_mem,
!                                           s1, s2) {};
    virtual int Opcode() const;
    virtual bool depends_only_on_test() const { return false; }
    virtual const Type* bottom_type() const { return TypeInt::BOOL; }
    // a StrEqualsNode (conservatively) aliases with everything:
    virtual const TypePtr* adr_type() const { return TypePtr::BOTTOM; }
--- 764,776 ----
  //------------------------------StrEquals-------------------------------------
  class StrEqualsNode: public Node {
  public:
    StrEqualsNode(Node *control,
                  Node* char_array_mem,
!                 Node* s1, Node* s2, Node* c): Node(control,
                                                     char_array_mem,
!                                                    s1, s2, c) {};
    virtual int Opcode() const;
    virtual bool depends_only_on_test() const { return false; }
    virtual const Type* bottom_type() const { return TypeInt::BOOL; }
    // a StrEqualsNode (conservatively) aliases with everything:
    virtual const TypePtr* adr_type() const { return TypePtr::BOTTOM; }
*** 792,810 ****
  //------------------------------StrIndexOf-------------------------------------
  class StrIndexOfNode: public Node {
  public:
    StrIndexOfNode(Node *control,
                   Node* char_array_mem,
!                  Node* value_mem,
!                  Node* count_mem,
!                  Node* offset_mem,
!                  Node* s1, Node* s2): Node(control,
                                             char_array_mem,
!                                            value_mem,
!                                            count_mem,
!                                            offset_mem,
!                                            s1, s2) {};
    virtual int Opcode() const;
    virtual bool depends_only_on_test() const { return false; }
    virtual const Type* bottom_type() const { return TypeInt::INT; }
    // a StrIndexOfNode (conservatively) aliases with everything:
    virtual const TypePtr* adr_type() const { return TypePtr::BOTTOM; }
--- 782,796 ----
  //------------------------------StrIndexOf-------------------------------------
  class StrIndexOfNode: public Node {
  public:
    StrIndexOfNode(Node *control,
                   Node* char_array_mem,
!                  Node* s1, Node* s2,
!                  Node* c1, Node* c2): Node(control,
                                             char_array_mem,
!                                            s1, s2,
!                                            c1, c2) {};
    virtual int Opcode() const;
    virtual bool depends_only_on_test() const { return false; }
    virtual const Type* bottom_type() const { return TypeInt::INT; }
    // a StrIndexOfNode (conservatively) aliases with everything:
    virtual const TypePtr* adr_type() const { return TypePtr::BOTTOM; }