# HG changeset patch
# Parent c396bf7b948785e275c67e9b64c3ff8b7e03bbe1
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.cpp b/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.cpp
--- a/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.cpp
@@ -1311,6 +1311,7 @@
     FLAG_SET_DEFAULT(ShenandoahBarriersForConst,       true);
     FLAG_SET_DEFAULT(ShenandoahWriteBarrierRB,         false);
     FLAG_SET_DEFAULT(ShenandoahAllocImplicitLive,      false);
+    FLAG_SET_DEFAULT(ShenandoahWriteBarrierMemBar,     false);
   }
 
   virtual bool should_start_concurrent_mark(size_t used, size_t capacity) const {
diff --git a/src/hotspot/share/opto/graphKit.cpp b/src/hotspot/share/opto/graphKit.cpp
--- a/src/hotspot/share/opto/graphKit.cpp
+++ b/src/hotspot/share/opto/graphKit.cpp
@@ -4255,6 +4255,7 @@
 
     // Now some of the values
     Node* marking = __ load(__ ctrl(), gc_state_adr, TypeInt::BYTE, T_BYTE, Compile::AliasIdxRaw);
+    marking = __ AndI(marking, __ ConI(ShenandoahHeap::EVACUATION | ShenandoahHeap::PARTIAL | ShenandoahHeap::TRAVERSAL));
     // if (!marking)
     __ if_then(marking, BoolTest::ne, zero, unlikely); {
       BasicType index_bt = TypeX_X->basic_type();