src/hotspot/cpu/sparc/gc/g1/g1BarrierSetAssembler_sparc.cpp

*** 27,37 ****
  #include "gc/g1/g1BarrierSet.hpp"
  #include "gc/g1/g1CardTable.hpp"
  #include "gc/g1/g1BarrierSetAssembler.hpp"
  #include "gc/g1/g1ThreadLocalData.hpp"
  #include "gc/g1/heapRegion.hpp"
- #include "gc/shared/collectedHeap.hpp"
  #include "interpreter/interp_masm.hpp"
  #include "runtime/sharedRuntime.hpp"
  #include "utilities/macros.hpp"
  
  #define __ masm->
--- 27,36 ----
*** 360,370 ****
    Label filtered;
    MacroAssembler* post_filter_masm = masm;
  
    if (new_val == G0) return;
  
!   G1BarrierSet* bs = barrier_set_cast<G1BarrierSet>(Universe::heap()->barrier_set());
  
    if (G1RSBarrierRegionFilter) {
      __ xor3(store_addr, new_val, tmp);
      __ srlx(tmp, HeapRegion::LogOfHRGrainBytes, tmp);
  
--- 359,369 ----
    Label filtered;
    MacroAssembler* post_filter_masm = masm;
  
    if (new_val == G0) return;
  
!   G1BarrierSet* bs = barrier_set_cast<G1BarrierSet>(BarrierSet::barrier_set());
  
    if (G1RSBarrierRegionFilter) {
      __ xor3(store_addr, new_val, tmp);
      __ srlx(tmp, HeapRegion::LogOfHRGrainBytes, tmp);