src/hotspot/cpu/s390/stubGenerator_s390.cpp

*** 1306,1316 ****
      }
      if (aligned) {
        decorators |= ARRAYCOPY_ALIGNED;
      }
  
!     BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
      bs->arraycopy_prologue(_masm, decorators, T_OBJECT, Z_ARG1, Z_ARG2, Z_ARG3);
  
      generate_disjoint_copy(aligned, size, true, true);
  
      bs->arraycopy_epilogue(_masm, decorators, T_OBJECT, Z_ARG2, Z_ARG3, true);
--- 1306,1316 ----
      }
      if (aligned) {
        decorators |= ARRAYCOPY_ALIGNED;
      }
  
!     BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
      bs->arraycopy_prologue(_masm, decorators, T_OBJECT, Z_ARG1, Z_ARG2, Z_ARG3);
  
      generate_disjoint_copy(aligned, size, true, true);
  
      bs->arraycopy_epilogue(_masm, decorators, T_OBJECT, Z_ARG2, Z_ARG3, true);
*** 1398,1408 ****
      }
      if (aligned) {
        decorators |= ARRAYCOPY_ALIGNED;
      }
  
!     BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
      bs->arraycopy_prologue(_masm, decorators, T_OBJECT, Z_ARG1, Z_ARG2, Z_ARG3);
  
      generate_conjoint_copy(aligned, size, true);  // Must preserve ARG2, ARG3.
  
      bs->arraycopy_epilogue(_masm, decorators, T_OBJECT, Z_ARG2, Z_ARG3, true);
--- 1398,1408 ----
      }
      if (aligned) {
        decorators |= ARRAYCOPY_ALIGNED;
      }
  
!     BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
      bs->arraycopy_prologue(_masm, decorators, T_OBJECT, Z_ARG1, Z_ARG2, Z_ARG3);
  
      generate_conjoint_copy(aligned, size, true);  // Must preserve ARG2, ARG3.
  
      bs->arraycopy_epilogue(_masm, decorators, T_OBJECT, Z_ARG2, Z_ARG3, true);