--- old/src/share/vm/c1/c1_LIRGenerator.cpp	2019-11-11 16:09:46.815343445 +0100
+++ new/src/share/vm/c1/c1_LIRGenerator.cpp	2019-11-11 16:09:46.729343449 +0100
@@ -1430,9 +1430,13 @@
 #if INCLUDE_ALL_GCS
     case BarrierSet::G1SATBCT:
     case BarrierSet::G1SATBCTLogging:
-    case BarrierSet::ShenandoahBarrierSet:
       G1SATBCardTableModRef_pre_barrier(addr_opr, pre_val, do_load, patch, info);
       break;
+    case BarrierSet::ShenandoahBarrierSet:
+      if (ShenandoahSATBBarrier) {
+        G1SATBCardTableModRef_pre_barrier(addr_opr, pre_val, do_load, patch, info);
+      }
+      break;
 #endif // INCLUDE_ALL_GCS
     case BarrierSet::CardTableModRef:
     case BarrierSet::CardTableExtension:
@@ -1456,6 +1460,7 @@
       G1SATBCardTableModRef_post_barrier(addr,  new_val);
       break;
     case BarrierSet::ShenandoahBarrierSet:
+      ShenandoahBarrierSetC1::bsc1()->storeval_barrier(this, new_val, NULL, false);
       break;
 #endif // INCLUDE_ALL_GCS
     case BarrierSet::CardTableModRef: