--- a/src/hotspot/cpu/arm/templateTable_arm.cpp	Thu Feb 08 20:56:03 2018 +0100
+++ b/src/hotspot/cpu/arm/templateTable_arm.cpp	Thu Feb 08 21:05:35 2018 +0100
@@ -245,11 +245,13 @@
       }
       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;
+      {
+        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: