src/hotspot/cpu/arm/interp_masm_arm.cpp

*** 408,418 ****
  
  // The 1st part of the store check.
  // Sets card_table_base register.
  void InterpreterMacroAssembler::store_check_part1(Register card_table_base) {
    // Check barrier set type (should be card table) and element size
!   BarrierSet* bs = Universe::heap()->barrier_set();
    assert(bs->kind() == BarrierSet::CardTableBarrierSet,
           "Wrong barrier set kind");
  
    CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
    CardTable* ct = ctbs->card_table();
--- 408,418 ----
  
  // The 1st part of the store check.
  // Sets card_table_base register.
  void InterpreterMacroAssembler::store_check_part1(Register card_table_base) {
    // Check barrier set type (should be card table) and element size
!   BarrierSet* bs = BarrierSet::barrier_set();
    assert(bs->kind() == BarrierSet::CardTableBarrierSet,
           "Wrong barrier set kind");
  
    CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
    CardTable* ct = ctbs->card_table();
*** 475,485 ****
  
  void InterpreterMacroAssembler::set_card(Register card_table_base, Address card_table_addr, Register tmp) {
  #ifdef AARCH64
    strb(ZR, card_table_addr);
  #else
!   CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(Universe::heap()->barrier_set());
    CardTable* ct = ctbs->card_table();
    if ((((uintptr_t)ct->byte_map_base() & 0xff) == 0)) {
      // Card table is aligned so the lowest byte of the table address base is zero.
      // This works only if the code is not saved for later use, possibly
      // in a context where the base would no longer be aligned.
--- 475,485 ----
  
  void InterpreterMacroAssembler::set_card(Register card_table_base, Address card_table_addr, Register tmp) {
  #ifdef AARCH64
    strb(ZR, card_table_addr);
  #else
!   CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
    CardTable* ct = ctbs->card_table();
    if ((((uintptr_t)ct->byte_map_base() & 0xff) == 0)) {
      // Card table is aligned so the lowest byte of the table address base is zero.
      // This works only if the code is not saved for later use, possibly
      // in a context where the base would no longer be aligned.