src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp

*** 28,38 ****
  #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"
  
  #define __ masm->
  
  void G1BarrierSetAssembler::gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators,
--- 28,37 ----
*** 202,212 ****
    bool not_null = (decorators & OOP_NOT_NULL) != 0;
  
    Label runtime, filtered;
    assert_different_registers(store_addr, new_val, tmp1, tmp2);
  
!   CardTableBarrierSet* ct = barrier_set_cast<CardTableBarrierSet>(Universe::heap()->barrier_set());
    assert(sizeof(*ct->card_table()->byte_map_base()) == sizeof(jbyte), "adjust this code");
  
    // Does store cross heap regions?
    if (G1RSBarrierRegionFilter) {
      __ xorr(tmp1, store_addr, new_val);
--- 201,211 ----
    bool not_null = (decorators & OOP_NOT_NULL) != 0;
  
    Label runtime, filtered;
    assert_different_registers(store_addr, new_val, tmp1, tmp2);
  
!   CardTableBarrierSet* ct = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
    assert(sizeof(*ct->card_table()->byte_map_base()) == sizeof(jbyte), "adjust this code");
  
    // Does store cross heap regions?
    if (G1RSBarrierRegionFilter) {
      __ xorr(tmp1, store_addr, new_val);