Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/opto/stringopts.cpp	Thu Nov 07 11:47:11 2013 +0100
     1.2 +++ b/src/share/vm/opto/stringopts.cpp	Fri Nov 15 11:05:32 2013 -0800
     1.3 @@ -1122,7 +1122,8 @@
     1.4  
     1.5    return kit.make_load(NULL, kit.basic_plus_adr(klass_node, field->offset_in_bytes()),
     1.6                         type, T_OBJECT,
     1.7 -                       C->get_alias_index(mirror_type->add_offset(field->offset_in_bytes())));
     1.8 +                       C->get_alias_index(mirror_type->add_offset(field->offset_in_bytes())),
     1.9 +                       MemNode::unordered);
    1.10  }
    1.11  
    1.12  Node* PhaseStringOpts::int_stringSize(GraphKit& kit, Node* arg) {
    1.13 @@ -1314,7 +1315,7 @@
    1.14      Node* ch = __ AddI(r, __ intcon('0'));
    1.15  
    1.16      Node* st = __ store_to_memory(kit.control(), kit.array_element_address(char_array, m1, T_CHAR),
    1.17 -                                  ch, T_CHAR, char_adr_idx);
    1.18 +                                  ch, T_CHAR, char_adr_idx, MemNode::unordered);
    1.19  
    1.20  
    1.21      IfNode* iff = kit.create_and_map_if(head, __ Bool(__ CmpI(q, __ intcon(0)), BoolTest::ne),
    1.22 @@ -1356,7 +1357,7 @@
    1.23      } else {
    1.24        Node* m1 = __ SubI(charPos, __ intcon(1));
    1.25        Node* st = __ store_to_memory(kit.control(), kit.array_element_address(char_array, m1, T_CHAR),
    1.26 -                                    sign, T_CHAR, char_adr_idx);
    1.27 +                                    sign, T_CHAR, char_adr_idx, MemNode::unordered);
    1.28  
    1.29        final_merge->init_req(1, kit.control());
    1.30        final_mem->init_req(1, st);
    1.31 @@ -1387,7 +1388,8 @@
    1.32      ciTypeArray* value_array = t->const_oop()->as_type_array();
    1.33      for (int e = 0; e < c; e++) {
    1.34        __ store_to_memory(kit.control(), kit.array_element_address(char_array, start, T_CHAR),
    1.35 -                         __ intcon(value_array->char_at(o + e)), T_CHAR, char_adr_idx);
    1.36 +                         __ intcon(value_array->char_at(o + e)), T_CHAR, char_adr_idx,
    1.37 +                         MemNode::unordered);
    1.38        start = __ AddI(start, __ intcon(1));
    1.39      }
    1.40    } else {
    1.41 @@ -1607,7 +1609,7 @@
    1.42          }
    1.43          case StringConcat::CharMode: {
    1.44            __ store_to_memory(kit.control(), kit.array_element_address(char_array, start, T_CHAR),
    1.45 -                             arg, T_CHAR, char_adr_idx);
    1.46 +                             arg, T_CHAR, char_adr_idx, MemNode::unordered);
    1.47            start = __ AddI(start, __ intcon(1));
    1.48            break;
    1.49          }