--- a/src/hotspot/share/c1/c1_LIRGenerator.cpp	Mon Mar 12 12:28:43 2018 +0100
+++ b/src/hotspot/share/c1/c1_LIRGenerator.cpp	Mon Mar 12 16:53:47 2018 +0100
@@ -1462,9 +1462,11 @@
     case BarrierSet::G1SATBCTLogging:
       G1SATBCardTableModRef_pre_barrier(addr_opr, pre_val, do_load, patch, info);
       break;
+    case BarrierSet::Epsilon:
+      // No barriers
+      break;
 #endif // INCLUDE_ALL_GCS
     case BarrierSet::CardTableModRef:
-    case BarrierSet::Epsilon:
       // No pre barriers
       break;
     default      :
@@ -1479,13 +1481,13 @@
     case BarrierSet::G1SATBCTLogging:
       G1SATBCardTableModRef_post_barrier(addr,  new_val);
       break;
+    case BarrierSet::Epsilon:
+      // No barriers
+      break;
 #endif // INCLUDE_ALL_GCS
     case BarrierSet::CardTableModRef:
       CardTableModRef_post_barrier(addr,  new_val);
       break;
-    case BarrierSet::Epsilon:
-      // No post barriers
-      break;
     default      :
       ShouldNotReachHere();
     }