--- old/src/hotspot/share/opto/graphKit.cpp	2018-04-26 19:34:15.398178714 +0200
+++ new/src/hotspot/share/opto/graphKit.cpp	2018-04-26 19:34:15.182070712 +0200
@@ -1570,6 +1570,7 @@
       break;
 
     case BarrierSet::CardTableBarrierSet:
+    case BarrierSet::Epsilon:
       break;
 
     default      :
@@ -1585,6 +1586,7 @@
       return true; // Can move it if no safepoint
 
     case BarrierSet::CardTableBarrierSet:
+    case BarrierSet::Epsilon:
       return true; // There is no pre-barrier
 
     default      :
@@ -1612,6 +1614,9 @@
       write_barrier_post(store, obj, adr, adr_idx, val, use_precise);
       break;
 
+    case BarrierSet::Epsilon:
+      break;
+
     default      :
       ShouldNotReachHere();