diff --git a/src/hotspot/share/compiler/disassembler.cpp b/src/hotspot/share/compiler/disassembler.cpp
index 644c886e3b3..2c1ef235e07 100644
--- a/src/hotspot/share/compiler/disassembler.cpp
+++ b/src/hotspot/share/compiler/disassembler.cpp
@@ -609,17 +609,21 @@ void decode_env::print_address(address adr) {
 
     address card_table_base = nullptr;
     BarrierSet* bs = BarrierSet::barrier_set();
+#if INCLUDE_G1GC
     if (bs->is_a(BarrierSet::G1BarrierSet)) {
       G1BarrierSet* g1bs = barrier_set_cast<G1BarrierSet>(bs);
       card_table_base = g1bs->card_table()->byte_map_base();
+    } else
+#endif
 #if INCLUDE_SHENANDOAHGC
-    } else if (bs->is_a(BarrierSet::ShenandoahBarrierSet)) {
+    if (bs->is_a(BarrierSet::ShenandoahBarrierSet)) {
       ShenandoahBarrierSet* sbs = barrier_set_cast<ShenandoahBarrierSet>(bs);
       if (sbs->card_table() != nullptr) {
         card_table_base = sbs->card_table()->byte_map_base();
       }
+    } else
 #endif
-    } else if (bs->is_a(BarrierSet::CardTableBarrierSet)) {
+    if (bs->is_a(BarrierSet::CardTableBarrierSet)) {
       card_table_base = ci_card_table_address_as<address>();
     }
     if (card_table_base != nullptr && adr == card_table_base) {
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
index 6658dea0fff..a94025fa2ff 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
@@ -236,15 +236,19 @@ void CompilerToVM::Data::initialize(JVMCI_TRAPS) {
   JVMTI_ONLY( _should_notify_object_alloc = &JvmtiExport::_should_notify_object_alloc; )
 
   BarrierSet* bs = BarrierSet::barrier_set();
+#if INCLUDE_G1GC
   if (bs->is_a(BarrierSet::G1BarrierSet)) {
     cardtable_start_address = nullptr;
     cardtable_shift = CardTable::card_shift();
+  } else
+#fi
 #if INCLUDE_SHENANDOAHGC
-  } else if (bs->is_a(BarrierSet::ShenandoahBarrierSet)) {
+  if (bs->is_a(BarrierSet::ShenandoahBarrierSet)) {
     cardtable_start_address = nullptr;
     cardtable_shift = CardTable::card_shift();
+  } else
 #endif
-  } else if (bs->is_a(BarrierSet::CardTableBarrierSet)) {
+  if (bs->is_a(BarrierSet::CardTableBarrierSet)) {
     CardTable::CardValue* base = ci_card_table_address_const();
     assert(base != nullptr, "unexpected byte_map_base");
     cardtable_start_address = base;