--- old/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp	2018-04-12 10:20:19.061885478 +0200
+++ new/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp	2018-04-12 10:20:18.856876623 +0200
@@ -512,7 +512,7 @@
   __ z_bre(slow_path);
 
   //  Load the value of the referent field.
- BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
  bs->load_at(_masm, IN_HEAP | ON_WEAK_OOP_REF, T_OBJECT,
                    Address(pre_val, referent_offset), pre_val, scratch1, scratch2);