*** old/src/share/vm/opto/memnode.cpp	Tue Aug 18 19:06:27 2009
--- new/src/share/vm/opto/memnode.cpp	Tue Aug 18 19:06:26 2009

*** 2496,2506 ****
--- 2496,2506 ----
  }
  
  //=============================================================================
  // Do we match on this edge? No memory edges
  uint StrCompNode::match_edge(uint idx) const {
!   return idx == 5 || idx == 6;
!   return idx == 2 || idx == 3; // StrComp (Binary str1 str2) (Binary cnt1 cnt2)
  }
  
  //------------------------------Ideal------------------------------------------
  // Return a node which is more "ideal" than the current node.  Strip out
  // control copies

*** 2508,2518 ****
--- 2508,2518 ----
    return remove_dead_region(phase, can_reshape) ? this : NULL;
  }
  
  // Do we match on this edge? No memory edges
  uint StrEqualsNode::match_edge(uint idx) const {
!   return idx == 5 || idx == 6;
!   return idx == 2 || idx == 3; // StrEquals (Binary str1 str2) cnt
  }
  
  //------------------------------Ideal------------------------------------------
  // Return a node which is more "ideal" than the current node.  Strip out
  // control copies

*** 2521,2531 ****
--- 2521,2531 ----
  }
  
  //=============================================================================
  // Do we match on this edge? No memory edges
  uint StrIndexOfNode::match_edge(uint idx) const {
!   return idx == 5 || idx == 6;
!   return idx == 2 || idx == 3; // StrIndexOf (Binary str1 str2) (Binary cnt1 cnt2)
  }
  
  //------------------------------Ideal------------------------------------------
  // Return a node which is more "ideal" than the current node.  Strip out
  // control copies