src/hotspot/share/c1/c1_LIRGenerator.cpp

G1BarrierSet_merge

 void LIRGenerator::pre_barrier(LIR_Opr addr_opr, LIR_Opr pre_val,
                                bool do_load, bool patch, CodeEmitInfo* info) {
   // Do the pre-write barrier, if any.
   switch (_bs->kind()) {
 #if INCLUDE_ALL_GCS
-    case BarrierSet::G1SATBCTLogging:
+    case BarrierSet::G1BarrierSet:
       G1SATBCardTableModRef_pre_barrier(addr_opr, pre_val, do_load, patch, info);
       break;
 #endif // INCLUDE_ALL_GCS
     case BarrierSet::CardTableModRef:
       // No pre barriers

@@ -1473,11 +1473,11
 }
 
 void LIRGenerator::post_barrier(LIR_OprDesc* addr, LIR_OprDesc* new_val) {
   switch (_bs->kind()) {
 #if INCLUDE_ALL_GCS
-    case BarrierSet::G1SATBCTLogging:
+    case BarrierSet::G1BarrierSet:
       G1SATBCardTableModRef_post_barrier(addr,  new_val);
       break;
 #endif // INCLUDE_ALL_GCS
     case BarrierSet::CardTableModRef:
       CardTableModRef_post_barrier(addr,  new_val);