--- old/src/hotspot/share/c1/c1_LIRGenerator.cpp	2018-04-26 19:34:10.891926682 +0200
+++ new/src/hotspot/share/c1/c1_LIRGenerator.cpp	2018-04-26 19:34:10.679820679 +0200
@@ -1464,6 +1464,9 @@
     case BarrierSet::G1BarrierSet:
       G1BarrierSet_pre_barrier(addr_opr, pre_val, do_load, patch, info);
       break;
+    case BarrierSet::Epsilon:
+      // No barriers
+      break;
 #endif // INCLUDE_ALL_GCS
     case BarrierSet::CardTableBarrierSet:
       // No pre barriers
@@ -1480,6 +1483,9 @@
     case BarrierSet::G1BarrierSet:
       G1BarrierSet_post_barrier(addr,  new_val);
       break;
+    case BarrierSet::Epsilon:
+      // No barriers
+      break;
 #endif // INCLUDE_ALL_GCS
     case BarrierSet::CardTableBarrierSet:
       CardTableBarrierSet_post_barrier(addr,  new_val);