src/hotspot/cpu/sparc/gc/shared/cardTableBarrierSetAssembler_sparc.cpp

*** 27,37 ****
  #include "asm/macroAssembler.inline.hpp"
  #include "gc/shared/barrierSet.hpp"
  #include "gc/shared/cardTable.hpp"
  #include "gc/shared/cardTableBarrierSet.hpp"
  #include "gc/shared/cardTableBarrierSetAssembler.hpp"
- #include "gc/shared/collectedHeap.hpp"
  #include "interpreter/interp_masm.hpp"
  
  #define __ masm->
  
  #ifdef PRODUCT
--- 27,36 ----
*** 42,52 ****
  
  #define BIND(label) bind(label); BLOCK_COMMENT(#label ":")
  
  void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
                                                                      Register addr, Register count, Register tmp) {
!   CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(Universe::heap()->barrier_set());
    CardTable* ct = ctbs->card_table();
    assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code");
    assert_different_registers(addr, count, tmp);
  
    Label L_loop, L_done;
--- 41,51 ----
  
  #define BIND(label) bind(label); BLOCK_COMMENT(#label ":")
  
  void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
                                                                      Register addr, Register count, Register tmp) {
!   CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
    CardTable* ct = ctbs->card_table();
    assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code");
    assert_different_registers(addr, count, tmp);
  
    Label L_loop, L_done;
*** 81,91 ****
  }
  
  void CardTableBarrierSetAssembler::card_write_barrier_post(MacroAssembler* masm, Register store_addr, Register new_val, Register tmp) {
    // If we're writing constant NULL, we can skip the write barrier.
    if (new_val == G0) return;
!   CardTableBarrierSet* bs = barrier_set_cast<CardTableBarrierSet>(Universe::heap()->barrier_set());
    card_table_write(masm, bs->card_table()->byte_map_base(), tmp, store_addr);
  }
  
  void CardTableBarrierSetAssembler::oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                                                  Register val, Address dst, Register tmp) {
--- 80,90 ----
  }
  
  void CardTableBarrierSetAssembler::card_write_barrier_post(MacroAssembler* masm, Register store_addr, Register new_val, Register tmp) {
    // If we're writing constant NULL, we can skip the write barrier.
    if (new_val == G0) return;
!   CardTableBarrierSet* bs = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
    card_table_write(masm, bs->card_table()->byte_map_base(), tmp, store_addr);
  }
  
  void CardTableBarrierSetAssembler::oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                                                  Register val, Address dst, Register tmp) {