--- a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp	Tue Apr 10 11:14:50 2018 +0200
+++ b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp	Tue Apr 10 11:59:53 2018 +0200
@@ -184,6 +184,13 @@
 
       }
       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::CardTableBarrierSet:
       {
@@ -202,7 +209,6 @@
       }
       break;
     case BarrierSet::ModRef:
-    case BarrierSet::Epsilon:
       if (val == noreg) {
         __ store_heap_oop_null(obj);
       } else {