src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp

*** 147,24 ***
      FLAG_SET_DEFAULT(UseCountedLoopSafepoints, true);
      if (FLAG_IS_DEFAULT(LoopStripMiningIter)) {
        FLAG_SET_DEFAULT(LoopStripMiningIter, 1000);
      }
    }
- #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(ShenandoahCASBarrier)             ||
-            !FLAG_IS_DEFAULT(ShenandoahCloneBarrier)
-           )) {
-     warning("Unusual barrier configuration, disabling C2 barrier verification");
-     FLAG_SET_DEFAULT(ShenandoahVerifyOptoBarriers, false);
-   }
- #else
-   guarantee(!ShenandoahVerifyOptoBarriers, "Should be disabled");
- #endif // ASSERT
  #endif // COMPILER2
  
    // Record more information about previous cycles for improved debugging pleasure
    if (FLAG_IS_DEFAULT(LogEventsBufferEntries)) {
      FLAG_SET_DEFAULT(LogEventsBufferEntries, 250);
--- 147,10 ---