From c8eef9c1094aecc2e16603c21f3a643a0f7b4bc4 Mon Sep 17 00:00:00 2001
From: Roman Kennke <rkennke@amazon.de>
Date: Tue, 6 May 2025 14:15:24 +0200
Subject: [PATCH] 8356266: Fix non-Shenandoah build after JDK-8356075

---
 src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
index c1c21a1043fc8..591f30e7b19d1 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
@@ -236,9 +236,11 @@ void CompilerToVM::Data::initialize(JVMCI_TRAPS) {
     assert(base != nullptr, "unexpected byte_map_base");
     cardtable_start_address = base;
     cardtable_shift = CardTable::card_shift();
+#if INCLUDE_SHENANDOAHGC
   } else if (bs->is_a(BarrierSet::ShenandoahBarrierSet)) {
     cardtable_start_address = nullptr;
     cardtable_shift = CardTable::card_shift();
+#endif
   } else {
     // No card mark barriers
     cardtable_start_address = nullptr;