--- a/src/hotspot/cpu/s390/interp_masm_s390.cpp	Wed May 16 11:11:03 2018 -0400
+++ b/src/hotspot/cpu/s390/interp_masm_s390.cpp	Thu May 17 14:19:54 2018 +0200
@@ -391,8 +391,7 @@
   bind(index_ok);
 #endif
   z_agr(result, index);    // Address of indexed array element.
-  BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
-  bs->load_at(this, IN_HEAP, T_OBJECT, Address(result, arrayOopDesc::base_offset_in_bytes(T_OBJECT)), result, tmp, noreg);
+  load_heap_oop(result, Address(result, arrayOopDesc::base_offset_in_bytes(T_OBJECT)), tmp, noreg);
 }
 
 // load cpool->resolved_klass_at(index)