src/share/vm/opto/gcm.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 502,513 ****
           "String compare is only known 'load' that does not conflict with any stores");
    assert(load_alias_idx || (load->is_Mach() && load->as_Mach()->ideal_Opcode() == Op_StrEquals),
           "String equals is a 'load' that does not conflict with any stores");
    assert(load_alias_idx || (load->is_Mach() && load->as_Mach()->ideal_Opcode() == Op_StrIndexOf),
           "String indexOf is a 'load' that does not conflict with any stores");
    assert(load_alias_idx || (load->is_Mach() && load->as_Mach()->ideal_Opcode() == Op_AryEq),
!          "Arrays equals is a 'load' that do not conflict with any stores");
  
    if (!C->alias_type(load_alias_idx)->is_rewritable()) {
      // It is impossible to spoil this load by putting stores before it,
      // because we know that the stores will never update the value
      // which 'load' must witness.
--- 502,517 ----
           "String compare is only known 'load' that does not conflict with any stores");
    assert(load_alias_idx || (load->is_Mach() && load->as_Mach()->ideal_Opcode() == Op_StrEquals),
           "String equals is a 'load' that does not conflict with any stores");
    assert(load_alias_idx || (load->is_Mach() && load->as_Mach()->ideal_Opcode() == Op_StrIndexOf),
           "String indexOf is a 'load' that does not conflict with any stores");
+   assert(load_alias_idx || (load->is_Mach() && load->as_Mach()->ideal_Opcode() == Op_StrIndexOfChar),
+          "String indexOfChar is a 'load' that does not conflict with any stores");
    assert(load_alias_idx || (load->is_Mach() && load->as_Mach()->ideal_Opcode() == Op_AryEq),
!          "Arrays equals is a 'load' that does not conflict with any stores");
!   assert(load_alias_idx || (load->is_Mach() && load->as_Mach()->ideal_Opcode() == Op_HasNegatives),
!          "HasNegatives is a 'load' that does not conflict with any stores");
  
    if (!C->alias_type(load_alias_idx)->is_rewritable()) {
      // It is impossible to spoil this load by putting stores before it,
      // because we know that the stores will never update the value
      // which 'load' must witness.