--- a/src/hotspot/cpu/s390/templateTable_s390.cpp	Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/s390/templateTable_s390.cpp	Thu Apr 12 11:22:24 2018 +0200
@@ -200,7 +200,7 @@
                          Register           tmp3,
                          DecoratorSet       decorators) {
   assert_different_registers(tmp1, tmp2, tmp3, val, addr.base());
-  BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+  BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
   bs->store_at(_masm, decorators, T_OBJECT, addr, val, tmp1, tmp2, tmp3);
 }
 
@@ -212,7 +212,7 @@
                         DecoratorSet decorators) {
   assert_different_registers(addr.base(), tmp1, tmp2);
   assert_different_registers(dst, tmp1, tmp2);
-  BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+  BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
   bs->load_at(_masm, decorators, T_OBJECT, addr, dst, tmp1, tmp2);
 }