src/hotspot/cpu/aarch64/templateTable_aarch64.cpp

*** 145,163 ****
  static void do_oop_store(InterpreterMacroAssembler* _masm,
                           Address dst,
                           Register val,
                           DecoratorSet decorators) {
    assert(val == noreg || val == r0, "parameter is just for looks");
!   BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
    bs->store_at(_masm, decorators, T_OBJECT, dst, val, /*tmp1*/ r10, /*tmp2*/ r1);
  }
  
  static void do_oop_load(InterpreterMacroAssembler* _masm,
                          Address src,
                          Register dst,
                          DecoratorSet decorators) {
!   BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
    bs->load_at(_masm, decorators, T_OBJECT, dst, src, /*tmp1*/ r10, /*tmp_thread*/ r1);
  }
  
  Address TemplateTable::at_bcp(int offset) {
    assert(_desc->uses_bcp(), "inconsistent uses_bcp information");
--- 145,163 ----
  static void do_oop_store(InterpreterMacroAssembler* _masm,
                           Address dst,
                           Register val,
                           DecoratorSet decorators) {
    assert(val == noreg || val == r0, "parameter is just for looks");
!   BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
    bs->store_at(_masm, decorators, T_OBJECT, dst, val, /*tmp1*/ r10, /*tmp2*/ r1);
  }
  
  static void do_oop_load(InterpreterMacroAssembler* _masm,
                          Address src,
                          Register dst,
                          DecoratorSet decorators) {
!   BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
    bs->load_at(_masm, decorators, T_OBJECT, dst, src, /*tmp1*/ r10, /*tmp_thread*/ r1);
  }
  
  Address TemplateTable::at_bcp(int offset) {
    assert(_desc->uses_bcp(), "inconsistent uses_bcp information");