--- a/src/hotspot/share/opto/graphKit.cpp	Fri May 04 19:16:56 2018 +0200
+++ b/src/hotspot/share/opto/graphKit.cpp	Fri May 04 19:29:01 2018 +0200
@@ -1571,8 +1571,12 @@
       break;
 #endif
 
+#if INCLUDE_EPSILONGC
+    case BarrierSet::EpsilonBarrierSet:
+      break;
+#endif
+
     case BarrierSet::CardTableBarrierSet:
-    case BarrierSet::EpsilonBarrierSet:
       break;
 
     default      :
@@ -1590,8 +1594,12 @@
       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:
-    case BarrierSet::EpsilonBarrierSet:
       return true; // There is no pre-barrier
 
     default      :
@@ -1617,13 +1625,15 @@
       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;
 
-    case BarrierSet::EpsilonBarrierSet:
-      break;
-
     default      :
       ShouldNotReachHere();