src/share/vm/gc_implementation/shenandoah/shenandoahNormalMode.cpp

rev 11704 : [backport] 8241700: Shenandoah: Fold ShenandoahKeepAliveBarrier flag into ShenandoahSATBBarrier
Reviewed-by: shade
rev 11709 : [backport] 8242273: Shenandoah: accept either SATB or IU barriers, but not both
Reviewed-by: rkennke

*** 32,43 ****
    SHENANDOAH_ERGO_ENABLE_FLAG(ExplicitGCInvokesConcurrent);
    SHENANDOAH_ERGO_ENABLE_FLAG(ShenandoahImplicitGCInvokesConcurrent);
  
    // Final configuration checks
    SHENANDOAH_CHECK_FLAG_SET(ShenandoahLoadRefBarrier);
    SHENANDOAH_CHECK_FLAG_SET(ShenandoahSATBBarrier);
-   SHENANDOAH_CHECK_FLAG_SET(ShenandoahKeepAliveBarrier);
    SHENANDOAH_CHECK_FLAG_SET(ShenandoahCASBarrier);
    SHENANDOAH_CHECK_FLAG_SET(ShenandoahCloneBarrier);
  }
  
  ShenandoahHeuristics* ShenandoahNormalMode::initialize_heuristics() const {
--- 32,43 ----
    SHENANDOAH_ERGO_ENABLE_FLAG(ExplicitGCInvokesConcurrent);
    SHENANDOAH_ERGO_ENABLE_FLAG(ShenandoahImplicitGCInvokesConcurrent);
  
    // Final configuration checks
    SHENANDOAH_CHECK_FLAG_SET(ShenandoahLoadRefBarrier);
+   SHENANDOAH_CHECK_FLAG_UNSET(ShenandoahStoreValEnqueueBarrier);
    SHENANDOAH_CHECK_FLAG_SET(ShenandoahSATBBarrier);
    SHENANDOAH_CHECK_FLAG_SET(ShenandoahCASBarrier);
    SHENANDOAH_CHECK_FLAG_SET(ShenandoahCloneBarrier);
  }
  
  ShenandoahHeuristics* ShenandoahNormalMode::initialize_heuristics() const {