src/hotspot/share/opto/arraycopynode.cpp

*** 180,189 ****
--- 180,190 ----
    }
  
    ciInstanceKlass* ik = inst_src->klass()->as_instance_klass();
    assert(ik->nof_nonstatic_fields() <= ArrayCopyLoadStoreMaxElem, "too many fields");
  
+   BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2();
    for (int i = 0; i < count; i++) {
      ciField* field = ik->nonstatic_field_at(i);
      int fieldidx = phase->C->alias_type(field)->index();
      const TypePtr* adr_type = phase->C->alias_type(field)->adr_type();
      Node* off = phase->MakeConX(field->offset());
*** 203,212 ****
--- 204,216 ----
        type = Type::get_const_basic_type(bt);
      }
  
      Node* v = LoadNode::make(*phase, ctl, mem->memory_at(fieldidx), next_src, adr_type, type, bt, MemNode::unordered);
      v = phase->transform(v);
+     if (bt == T_OBJECT) {
+       v = bs->array_copy_load_store_barrier(phase, can_reshape, v, mem, ctl);
+     }
      Node* s = StoreNode::make(*phase, ctl, mem->memory_at(fieldidx), next_dest, adr_type, v, bt, MemNode::unordered);
      s = phase->transform(s);
      mem->set_memory_at(fieldidx, s);
    }
  
*** 374,393 ****
--- 378,404 ----
      Node *start_mem_dest = mm->memory_at(alias_idx_dest);
      Node* mem = start_mem_dest;
      bool same_alias = (alias_idx_src == alias_idx_dest);
  
      if (count > 0) {
+       BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2();
        Node* v = LoadNode::make(*phase, forward_ctl, start_mem_src, adr_src, atp_src, value_type, copy_type, MemNode::unordered);
        v = phase->transform(v);
+       if (copy_type == T_OBJECT) {
+         v = bs->array_copy_load_store_barrier(phase, can_reshape, v, mm, forward_ctl);
+       }
        mem = StoreNode::make(*phase, forward_ctl, mem, adr_dest, atp_dest, v, copy_type, MemNode::unordered);
        mem = phase->transform(mem);
        for (int i = 1; i < count; i++) {
          Node* off  = phase->MakeConX(type2aelembytes(copy_type) * i);
          Node* next_src = phase->transform(new AddPNode(base_src,adr_src,off));
          Node* next_dest = phase->transform(new AddPNode(base_dest,adr_dest,off));
          v = LoadNode::make(*phase, forward_ctl, same_alias ? mem : start_mem_src, next_src, atp_src, value_type, copy_type, MemNode::unordered);
          v = phase->transform(v);
+         if (copy_type == T_OBJECT) {
+           v = bs->array_copy_load_store_barrier(phase, can_reshape, v, mm, forward_ctl);
+         }
          mem = StoreNode::make(*phase, forward_ctl,mem,next_dest,atp_dest,v, copy_type, MemNode::unordered);
          mem = phase->transform(mem);
        }
        mm->set_memory_at(alias_idx_dest, mem);
      } else if(can_reshape) {
*** 431,445 ****
--- 442,462 ----
          Node* off  = phase->MakeConX(type2aelembytes(copy_type) * i);
          Node* next_src = phase->transform(new AddPNode(base_src,adr_src,off));
          Node* next_dest = phase->transform(new AddPNode(base_dest,adr_dest,off));
          Node* v = LoadNode::make(*phase, backward_ctl, same_alias ? mem : start_mem_src, next_src, atp_src, value_type, copy_type, MemNode::unordered);
          v = phase->transform(v);
+         if (copy_type == T_OBJECT) {
+           v = bs->array_copy_load_store_barrier(phase, can_reshape, v, mm, backward_ctl);
+         }
          mem = StoreNode::make(*phase, backward_ctl,mem,next_dest,atp_dest,v, copy_type, MemNode::unordered);
          mem = phase->transform(mem);
        }
        Node* v = LoadNode::make(*phase, backward_ctl, same_alias ? mem : start_mem_src, adr_src, atp_src, value_type, copy_type, MemNode::unordered);
        v = phase->transform(v);
+       if (copy_type == T_OBJECT) {
+         v = bs->array_copy_load_store_barrier(phase, can_reshape, v, mm, backward_ctl);
+       }
        mem = StoreNode::make(*phase, backward_ctl, mem, adr_dest, atp_dest, v, copy_type, MemNode::unordered);
        mem = phase->transform(mem);
        mm->set_memory_at(alias_idx_dest, mem);
      } else if(can_reshape) {
        PhaseIterGVN* igvn = phase->is_IterGVN();