src/share/vm/runtime/arguments.cpp

rev 11463 : Backport Traversal GC

*** 1730,1739 ****
--- 1730,1741 ----
  #if INCLUDE_ALL_GCS
    FLAG_SET_DEFAULT(ShenandoahGCHeuristics,           "passive");
  
    FLAG_SET_DEFAULT(ShenandoahSATBBarrier,            false);
    FLAG_SET_DEFAULT(ShenandoahLoadRefBarrier,         false);
+   FLAG_SET_DEFAULT(ShenandoahKeepAliveBarrier,       false);
+   FLAG_SET_DEFAULT(ShenandoahStoreValEnqueueBarrier, false);
    FLAG_SET_DEFAULT(ShenandoahCASBarrier,             false);
    FLAG_SET_DEFAULT(ShenandoahCloneBarrier,           false);
  
    FLAG_SET_DEFAULT(ShenandoahVerifyOptoBarriers,     false);
  #endif
*** 1841,1850 ****
--- 1843,1854 ----
  #ifdef ASSERT
    // C2 barrier verification is only reliable when all default barriers are enabled
    if (ShenandoahVerifyOptoBarriers &&
            (!FLAG_IS_DEFAULT(ShenandoahSATBBarrier)    ||
             !FLAG_IS_DEFAULT(ShenandoahLoadRefBarrier) ||
+            !FLAG_IS_DEFAULT(ShenandoahKeepAliveBarrier)       ||
+            !FLAG_IS_DEFAULT(ShenandoahStoreValEnqueueBarrier) ||
             !FLAG_IS_DEFAULT(ShenandoahCASBarrier)     ||
             !FLAG_IS_DEFAULT(ShenandoahCloneBarrier)
            )) {
      warning("Unusual barrier configuration, disabling C2 barrier verification");
      FLAG_SET_DEFAULT(ShenandoahVerifyOptoBarriers, false);