diff -r 97689d6b0494 -r ab47ddc3f427 src/hotspot/cpu/sparc/templateTable_sparc.cpp
--- a/src/hotspot/cpu/sparc/templateTable_sparc.cpp	Thu Feb 08 20:56:03 2018 +0100
+++ b/src/hotspot/cpu/sparc/templateTable_sparc.cpp	Thu Feb 08 21:05:35 2018 +0100
@@ -113,11 +113,13 @@
       }
       break;
     case BarrierSet::Epsilon:
-      if (index == noreg) {
-        assert(Assembler::is_simm13(offset), "fix this code");
-        __ store_heap_oop(val, base, offset);
-      } else {
-        __ store_heap_oop(val, base, index);
+      {
+        if (index == noreg) {
+          assert(Assembler::is_simm13(offset), "fix this code");
+          __ store_heap_oop(val, base, offset);
+        } else {
+          __ store_heap_oop(val, base, index);
+        }
       }
       break;
     case BarrierSet::ModRef: