--- old/src/hotspot/cpu/s390/macroAssembler_s390.cpp	2018-04-12 10:20:18.330853904 +0200
+++ new/src/hotspot/cpu/s390/macroAssembler_s390.cpp	2018-04-12 10:20:18.125845050 +0200
@@ -3499,7 +3499,7 @@
 }
 
 void MacroAssembler::resolve_jobject(Register value, Register tmp1, Register tmp2) {
-  BarrierSetAssembler* bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+  BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
   bs->resolve_jobject(this, value, tmp1, tmp2);
 }