--- a/src/hotspot/cpu/s390/templateTable_s390.cpp	Thu Feb 08 20:56:03 2018 +0100
+++ b/src/hotspot/cpu/s390/templateTable_s390.cpp	Thu Feb 08 21:05:35 2018 +0100
@@ -276,10 +276,12 @@
     }
     break;
   case BarrierSet::Epsilon:
-    if (val_is_null) {
-      __ store_heap_oop_null(val, offset, base);
-    } else {
-      __ store_heap_oop(val, offset, base);
+    {
+      if (val_is_null) {
+        __ store_heap_oop_null(val, offset, base);
+      } else {
+        __ store_heap_oop(val, offset, base);
+      }
     }
     break;
   case BarrierSet::ModRef: