--- a/src/hotspot/cpu/s390/stubGenerator_s390.cpp	Mon Oct 30 21:23:10 2017 +0100
+++ b/src/hotspot/cpu/s390/stubGenerator_s390.cpp	Mon Nov 06 18:53:38 2017 +0100
@@ -725,6 +725,7 @@
       case BarrierSet::CardTableForRS:
       case BarrierSet::CardTableExtension:
       case BarrierSet::ModRef:
+      case BarrierSet::Epsilon:
         break;
       default:
         ShouldNotReachHere();
@@ -859,6 +860,7 @@
         }
         break;
       case BarrierSet::ModRef:
+      case BarrierSet::Epsilon:
         if (!branchToEnd) { __ z_br(Z_R14); }
         break;
       default: