--- a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp	Mon Oct 30 21:23:10 2017 +0100
+++ b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp	Mon Nov 06 18:53:38 2017 +0100
@@ -202,6 +202,7 @@
       }
       break;
     case BarrierSet::ModRef:
+    case BarrierSet::Epsilon:
       if (val == noreg) {
         __ store_heap_oop_null(obj);
       } else {