src/hotspot/share/opto/macroArrayCopy.cpp

*** 70,80 ****
                                         const TypePtr* adr_type,
                                         Node* parm0, Node* parm1,
                                         Node* parm2, Node* parm3,
                                         Node* parm4, Node* parm5,
                                         Node* parm6, Node* parm7) {
-   int size = call_type->domain()->cnt();
    Node* call = new CallLeafNoFPNode(call_type, call_addr, call_name, adr_type);
    call->init_req(TypeFunc::Control, ctrl);
    call->init_req(TypeFunc::I_O    , top());
    call->init_req(TypeFunc::Memory , mem);
    call->init_req(TypeFunc::ReturnAdr, top());
--- 70,79 ----
*** 1105,1115 ****
      const TypeFunc* call_type = OptoRuntime::fast_arraycopy_Type();
  
      Node* call = make_leaf_call(ctrl, mem, call_type, copyfunc_addr, copyfunc_name, raw_adr_type, src, dest, length XTOP);
      transform_later(call);
  
!     _igvn.replace_node(ac, call);
      return;
    } else if (ac->is_copyof() || ac->is_copyofrange() || ac->is_cloneoop()) {
      Node* mem = ac->in(TypeFunc::Memory);
      merge_mem = MergeMemNode::make(mem);
      transform_later(merge_mem);
--- 1104,1116 ----
      const TypeFunc* call_type = OptoRuntime::fast_arraycopy_Type();
  
      Node* call = make_leaf_call(ctrl, mem, call_type, copyfunc_addr, copyfunc_name, raw_adr_type, src, dest, length XTOP);
      transform_later(call);
  
!     BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2();
!     bs->clone_barrier_at_expansion(ac, call, _igvn);
! 
      return;
    } else if (ac->is_copyof() || ac->is_copyofrange() || ac->is_cloneoop()) {
      Node* mem = ac->in(TypeFunc::Memory);
      merge_mem = MergeMemNode::make(mem);
      transform_later(merge_mem);