--- a/src/hotspot/cpu/arm/templateTable_arm.cpp	Mon Mar 12 12:28:43 2018 +0100
+++ b/src/hotspot/cpu/arm/templateTable_arm.cpp	Mon Mar 12 16:53:47 2018 +0100
@@ -227,6 +227,16 @@
         }
       }
       break;
+    case BarrierSet::Epsilon:
+      {
+        if (is_null) {
+          __ store_heap_oop_null(new_val, obj);
+        } else {
+          __ store_heap_oop(new_val, obj); // blows new_val:
+          new_val = noreg;
+        }
+      }
+      break;
 #endif // INCLUDE_ALL_GCS
     case BarrierSet::CardTableModRef:
       {
@@ -243,16 +253,6 @@
         }
       }
       break;
-    case BarrierSet::Epsilon:
-      {
-        if (is_null) {
-          __ store_heap_oop_null(new_val, obj);
-        } else {
-          __ store_heap_oop(new_val, obj); // blows new_val:
-          new_val = noreg;
-        }
-      }
-      break;
     case BarrierSet::ModRef:
       ShouldNotReachHere();
       break;