src/hotspot/cpu/x86/stubGenerator_x86_64.cpp

G1BarrierSet_merge

   //     Destroy no registers!
   //
   void  gen_write_ref_array_pre_barrier(Register addr, Register count, bool dest_uninitialized) {
     BarrierSet* 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 in uninitialized
         if (!dest_uninitialized) {
           Label filtered;
           Address in_progress(r15_thread, in_bytes(JavaThread::satb_mark_queue_offset() +
                                                    SATBMarkQueue::byte_offset_of_active()));

@@ -1255,11 +1255,11
   //
   void  gen_write_ref_array_post_barrier(Register start, Register count, Register scratch) {
     assert_different_registers(start, count, scratch);
     BarrierSet* bs = Universe::heap()->barrier_set();
     switch (bs->kind()) {
-      case BarrierSet::G1SATBCTLogging:
+      case BarrierSet::G1BarrierSet:
         {
           __ pusha();             // push registers (overkill)
           if (c_rarg0 == count) { // On win64 c_rarg0 == rcx
             assert_different_registers(c_rarg1, start);
             __ mov(c_rarg1, count);