src/hotspot/cpu/s390/stubGenerator_s390.cpp

G1BarrierSet_merge

   // The input registers are overwritten.
   void gen_write_ref_array_pre_barrier(Register addr, Register count, bool dest_uninitialized) {
 
     BarrierSet* const bs = Universe::heap()->barrier_set();
     switch (bs->kind()) {
-      case BarrierSet::G1SATBCTLogging:
+      case BarrierSet::G1BarrierSet:
         // With G1, don't generate the call if we statically know that the target is uninitialized.
         if (!dest_uninitialized) {
           // Is marking active?
           Label filtered;
           assert_different_registers(addr,  Z_R0_scratch);  // would be destroyed by push_frame()

@@ -740,11 +740,11
   //
   // The input registers are overwritten.
   void gen_write_ref_array_post_barrier(Register addr, Register count, bool branchToEnd) {
     BarrierSet* const bs = Universe::heap()->barrier_set();
     switch (bs->kind()) {
-      case BarrierSet::G1SATBCTLogging:
+      case BarrierSet::G1BarrierSet:
         {
           if (branchToEnd) {
             assert_different_registers(addr,  Z_R0_scratch);  // would be destroyed by push_frame()
             assert_different_registers(count, Z_R0_scratch);  // would be destroyed by push_frame()
             // __ push_frame_abi160(0);  // implicitly done in save_live_registers()