src/share/vm/c1/c1_LIRAssembler.cpp

*** 32,41 ****
--- 32,45 ----
  #include "ci/ciInstance.hpp"
  #ifdef TARGET_ARCH_x86
  # include "nativeInst_x86.hpp"
  # include "vmreg_x86.inline.hpp"
  #endif
+ #ifdef TARGET_ARCH_aarch64
+ # include "nativeInst_aarch64.hpp"
+ # include "vmreg_aarch64.inline.hpp"
+ #endif
  #ifdef TARGET_ARCH_sparc
  # include "nativeInst_sparc.hpp"
  # include "vmreg_sparc.inline.hpp"
  #endif
  #ifdef TARGET_ARCH_zero
*** 122,131 ****
--- 126,138 ----
   , _current_block(NULL)
   , _pending_non_safepoint(NULL)
   , _pending_non_safepoint_offset(0)
  {
    _slow_case_stubs = new CodeStubList();
+ #ifdef TARGET_ARCH_aarch64
+   init(); // Target-dependent initialization
+ #endif
  }
  
  
  LIR_Assembler::~LIR_Assembler() {
    // The unwind handler label may be unbound if this destructor is invoked because of a bail-out.
*** 161,172 ****
--- 168,181 ----
        _masm->block_comment(st.as_string());
      }
  #endif
      s->emit_code(this);
  #ifdef ASSERT
+ #ifndef AARCH64
      s->assert_no_unbound_labels();
  #endif
+ #endif
    }
  }
  
  
  void LIR_Assembler::emit_slow_case_stubs() {