src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp

*** 27,36 ****
--- 27,37 ----
  
  #include "precompiled.hpp"
  #include "jvm.h"
  #include "asm/assembler.hpp"
  #include "asm/assembler.inline.hpp"
+ #include "gc/shared/barrierSet.hpp"
  #include "gc/shared/cardTable.hpp"
  #include "gc/shared/barrierSetAssembler.hpp"
  #include "gc/shared/cardTableBarrierSet.hpp"
  #include "interpreter/interpreter.hpp"
  #include "compiler/disassembler.hpp"
*** 2090,2100 ****
  #endif
  }
  #endif
  
  void MacroAssembler::resolve_jobject(Register value, Register thread, Register tmp) {
!   BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
    Label done, not_weak;
    cbz(value, done);           // Use NULL as-is.
  
    STATIC_ASSERT(JNIHandles::weak_tag_mask == 1u);
    tbz(r0, 0, not_weak);    // Test for jweak tag.
--- 2091,2101 ----
  #endif
  }
  #endif
  
  void MacroAssembler::resolve_jobject(Register value, Register thread, Register tmp) {
!   BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
    Label done, not_weak;
    cbz(value, done);           // Use NULL as-is.
  
    STATIC_ASSERT(JNIHandles::weak_tag_mask == 1u);
    tbz(r0, 0, not_weak);    // Test for jweak tag.
*** 4314,4324 ****
    byte_offset = (unsigned long)dest.target() & 0xfff;
  }
  
  void MacroAssembler::load_byte_map_base(Register reg) {
    jbyte *byte_map_base =
!     ((CardTableBarrierSet*)(Universe::heap()->barrier_set()))->card_table()->byte_map_base();
  
    if (is_valid_AArch64_address((address)byte_map_base)) {
      // Strictly speaking the byte_map_base isn't an address at all,
      // and it might even be negative.
      unsigned long offset;
--- 4315,4325 ----
    byte_offset = (unsigned long)dest.target() & 0xfff;
  }
  
  void MacroAssembler::load_byte_map_base(Register reg) {
    jbyte *byte_map_base =
!     ((CardTableBarrierSet*)(BarrierSet::barrier_set()))->card_table()->byte_map_base();
  
    if (is_valid_AArch64_address((address)byte_map_base)) {
      // Strictly speaking the byte_map_base isn't an address at all,
      // and it might even be negative.
      unsigned long offset;