src/hotspot/share/gc/shared/gcConfiguration.cpp

@@ -45,10 +45,15 @@
    if (UseZGC) {
      return ZMinor;
    }
  
    if (UseShenandoahGC) {
+ #if INCLUDE_SHENANDOAHGC
+     if (ShenandoahCardBarrier) {
+       return ShenandoahYoung;
+     }
+ #endif
      return NA;
    }
  
    return DefNew;
  }

@@ -65,10 +70,15 @@
  if (UseZGC) {
      return ZMajor;
    }
  
    if (UseShenandoahGC) {
+ #if INCLUDE_SHENANDOAHGC
+     if (ShenandoahCardBarrier) {
+       return ShenandoahOld;
+     }
+ #endif
      return Shenandoah;
    }
  
    return SerialOld;
  }