src/hotspot/cpu/arm/macroAssembler_arm.cpp

*** 27,36 ****
--- 27,37 ----
  #include "asm/assembler.inline.hpp"
  #include "asm/macroAssembler.hpp"
  #include "ci/ciEnv.hpp"
  #include "code/nativeInst.hpp"
  #include "compiler/disassembler.hpp"
+ #include "gc/shared/barrierSet.hpp"
  #include "gc/shared/cardTable.hpp"
  #include "gc/shared/cardTableBarrierSet.hpp"
  #include "gc/shared/collectedHeap.inline.hpp"
  #include "interpreter/interpreter.hpp"
  #include "memory/resourceArea.hpp"
*** 2259,2269 ****
                                             Register tmp3) {
  
    Address queue_index(Rthread, in_bytes(G1ThreadLocalData::dirty_card_queue_index_offset()));
    Address buffer(Rthread, in_bytes(G1ThreadLocalData::dirty_card_queue_buffer_offset()));
  
!   BarrierSet* bs = Universe::heap()->barrier_set();
    CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
    CardTable* ct = ctbs->card_table();
    Label done;
    Label runtime;
  
--- 2260,2270 ----
                                             Register tmp3) {
  
    Address queue_index(Rthread, in_bytes(G1ThreadLocalData::dirty_card_queue_index_offset()));
    Address buffer(Rthread, in_bytes(G1ThreadLocalData::dirty_card_queue_buffer_offset()));
  
!   BarrierSet* bs = BarrierSet::barrier_set();
    CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
    CardTable* ct = ctbs->card_table();
    Label done;
    Label runtime;