--- old/src/hotspot/share/opto/graphKit.cpp	2018-05-07 16:47:13.498746009 +0200
+++ new/src/hotspot/share/opto/graphKit.cpp	2018-05-07 16:47:13.326660010 +0200
@@ -1571,6 +1571,11 @@
       break;
 #endif
 
+#if INCLUDE_EPSILONGC
+    case BarrierSet::EpsilonBarrierSet:
+      break;
+#endif
+
     case BarrierSet::CardTableBarrierSet:
       break;
 
@@ -1589,6 +1594,11 @@
       return true; // Can move it if no safepoint
 #endif
 
+#if INCLUDE_EPSILONGC
+    case BarrierSet::EpsilonBarrierSet:
+      return true; // There is no pre-barrier
+#endif
+
     case BarrierSet::CardTableBarrierSet:
       return true; // There is no pre-barrier
 
@@ -1615,6 +1625,11 @@
       break;
 #endif
 
+#if INCLUDE_EPSILONGC
+    case BarrierSet::EpsilonBarrierSet:
+      break;
+#endif
+
     case BarrierSet::CardTableBarrierSet:
       write_barrier_post(store, obj, adr, adr_idx, val, use_precise);
       break;