src/share/vm/adlc/formssel.cpp

*** 826,840 ****
        strcmp(_matrule->_opType,"SafePoint" )==0 ||
        strcmp(_matrule->_opType,"Halt"      )==0 )
      return AdlcVMDeps::Parms;   // Skip the machine-state edges
  
    if( _matrule->_rChild &&
!       ( strcmp(_matrule->_rChild->_opType,"StrComp"   )==0 ||
          strcmp(_matrule->_rChild->_opType,"StrEquals" )==0 ||
          strcmp(_matrule->_rChild->_opType,"StrIndexOf")==0 )) {
!         // String.(compareTo/equals/indexOf) take 1 control and 4 memory edges.
!     return 5;
    }
  
    // Check for handling of 'Memory' input/edge in the ideal world.
    // The AD file writer is shielded from knowledge of these edges.
    int base = 1;                 // Skip control
--- 826,842 ----
        strcmp(_matrule->_opType,"SafePoint" )==0 ||
        strcmp(_matrule->_opType,"Halt"      )==0 )
      return AdlcVMDeps::Parms;   // Skip the machine-state edges
  
    if( _matrule->_rChild &&
!       ( strcmp(_matrule->_rChild->_opType,"AryEq"     )==0 ||
!         strcmp(_matrule->_rChild->_opType,"StrComp"   )==0 ||
          strcmp(_matrule->_rChild->_opType,"StrEquals" )==0 ||
          strcmp(_matrule->_rChild->_opType,"StrIndexOf")==0 )) {
!         // String.(compareTo/equals/indexOf) and Arrays.equals
!         // take 1 control and 1 memory edges.
!     return 2;
    }
  
    // Check for handling of 'Memory' input/edge in the ideal world.
    // The AD file writer is shielded from knowledge of these edges.
    int base = 1;                 // Skip control