< prev index next >

src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp

Print this page
*** 87,12 ***
    bool needs_post_barrier = val != noreg && in_heap;
    BarrierSetAssembler::store_at(masm, decorators, type, dst, val, noreg, noreg, noreg);
    if (needs_post_barrier) {
      // flatten object address if needed
      if (!precise || (dst.index() == noreg && dst.offset() == 0)) {
!       store_check(masm, dst.base(), dst);
      } else {
        __ lea(tmp3, dst);
        store_check(masm, tmp3, dst);
      }
    }
  }
--- 87,21 ---
    bool needs_post_barrier = val != noreg && in_heap;
    BarrierSetAssembler::store_at(masm, decorators, type, dst, val, noreg, noreg, noreg);
    if (needs_post_barrier) {
      // flatten object address if needed
      if (!precise || (dst.index() == noreg && dst.offset() == 0)) {
!       if (tmp3 != noreg) {
+         // Called by MacroAssembler::pack_inline_helper. We cannot corrupt the dst.base() register
+         __ mov(tmp3, dst.base());
+         store_check(masm, tmp3, dst);
+       } else {
+         // It's OK to corrupt the dst.base() register.
+         store_check(masm, dst.base(), dst);
+       }
+ 
      } else {
        __ lea(tmp3, dst);
        store_check(masm, tmp3, dst);
      }
    }
+ 
  }
< prev index next >