src/hotspot/cpu/s390/templateTable_s390.cpp

*** 198,208 ****
                           Register           tmp1,
                           Register           tmp2,
                           Register           tmp3,
                           DecoratorSet       decorators) {
    assert_different_registers(tmp1, tmp2, tmp3, val, addr.base());
!   BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
    bs->store_at(_masm, decorators, T_OBJECT, addr, val, tmp1, tmp2, tmp3);
  }
  
  static void do_oop_load(InterpreterMacroAssembler* _masm,
                          const Address& addr,
--- 198,208 ----
                           Register           tmp1,
                           Register           tmp2,
                           Register           tmp3,
                           DecoratorSet       decorators) {
    assert_different_registers(tmp1, tmp2, tmp3, val, addr.base());
!   BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
    bs->store_at(_masm, decorators, T_OBJECT, addr, val, tmp1, tmp2, tmp3);
  }
  
  static void do_oop_load(InterpreterMacroAssembler* _masm,
                          const Address& addr,
*** 210,220 ****
                          Register tmp1,
                          Register tmp2,
                          DecoratorSet decorators) {
    assert_different_registers(addr.base(), tmp1, tmp2);
    assert_different_registers(dst, tmp1, tmp2);
!   BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
    bs->load_at(_masm, decorators, T_OBJECT, addr, dst, tmp1, tmp2);
  }
  
  Address TemplateTable::at_bcp(int offset) {
    assert(_desc->uses_bcp(), "inconsistent uses_bcp information");
--- 210,220 ----
                          Register tmp1,
                          Register tmp2,
                          DecoratorSet decorators) {
    assert_different_registers(addr.base(), tmp1, tmp2);
    assert_different_registers(dst, tmp1, tmp2);
!   BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
    bs->load_at(_masm, decorators, T_OBJECT, addr, dst, tmp1, tmp2);
  }
  
  Address TemplateTable::at_bcp(int offset) {
    assert(_desc->uses_bcp(), "inconsistent uses_bcp information");