diff -r be620a591379 -r 8e22715afabc src/hotspot/share/opto/graphKit.cpp
--- a/src/hotspot/share/opto/graphKit.cpp	Mon Oct 30 21:23:10 2017 +0100
+++ b/src/hotspot/share/opto/graphKit.cpp	Mon Nov 06 18:53:38 2017 +0100
@@ -1565,6 +1565,7 @@
     case BarrierSet::CardTableForRS:
     case BarrierSet::CardTableExtension:
     case BarrierSet::ModRef:
+    case BarrierSet::Epsilon:
       break;
 
     default      :
@@ -1582,6 +1583,7 @@
     case BarrierSet::CardTableForRS:
     case BarrierSet::CardTableExtension:
     case BarrierSet::ModRef:
+    case BarrierSet::Epsilon:
       return true; // There is no pre-barrier
 
     default      :
@@ -1611,6 +1613,7 @@
       break;
 
     case BarrierSet::ModRef:
+    case BarrierSet::Epsilon:
       break;
 
     default      :