--- old/src/share/vm/opto/memnode.hpp	Tue Aug 18 19:06:28 2009
+++ new/src/share/vm/opto/memnode.hpp	Tue Aug 18 19:06:28 2009
@@ -745,16 +745,12 @@
 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) {};
+                 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; }
@@ -770,15 +766,9 @@
 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) {};
+                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; }
@@ -794,15 +784,11 @@
 public:
   StrIndexOfNode(Node *control,
                  Node* char_array_mem,
-                 Node* value_mem,
-                 Node* count_mem,
-                 Node* offset_mem,
-                 Node* s1, Node* s2): Node(control,
+                 Node* s1, Node* s2,
+                 Node* c1, Node* c2): Node(control,
                                            char_array_mem,
-                                           value_mem,
-                                           count_mem,
-                                           offset_mem,
-                                           s1, s2) {};
+                                           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; }