--- a/src/hotspot/cpu/x86/templateTable_x86.cpp	Mon Mar 12 12:28:43 2018 +0100
+++ b/src/hotspot/cpu/x86/templateTable_x86.cpp	Mon Mar 12 16:53:47 2018 +0100
@@ -197,6 +197,13 @@
         NOT_LP64( __ restore_bcp());
       }
       break;
+    case BarrierSet::Epsilon:
+      if (val == noreg) {
+        __ store_heap_oop_null(obj);
+      } else {
+        __ store_heap_oop(obj, val);
+      }
+      break;
 #endif // INCLUDE_ALL_GCS
     case BarrierSet::CardTableModRef:
       {
@@ -215,7 +222,6 @@
       }
       break;
     case BarrierSet::ModRef:
-    case BarrierSet::Epsilon:
       if (val == noreg) {
         __ store_heap_oop_null(obj);
       } else {