src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp

*** 27,37 ****
  #include "gc/g1/g1BarrierSet.hpp"
  #include "gc/g1/g1BarrierSetAssembler.hpp"
  #include "gc/g1/g1CardTable.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 ----
*** 265,275 ****
  
    Address queue_index(thread, in_bytes(G1ThreadLocalData::dirty_card_queue_index_offset()));
    Address buffer(thread, in_bytes(G1ThreadLocalData::dirty_card_queue_buffer_offset()));
  
    CardTableBarrierSet* ct =
!     barrier_set_cast<CardTableBarrierSet>(Universe::heap()->barrier_set());
    assert(sizeof(*ct->card_table()->byte_map_base()) == sizeof(jbyte), "adjust this code");
  
    Label done;
    Label runtime;
  
--- 264,274 ----
  
    Address queue_index(thread, in_bytes(G1ThreadLocalData::dirty_card_queue_index_offset()));
    Address buffer(thread, in_bytes(G1ThreadLocalData::dirty_card_queue_buffer_offset()));
  
    CardTableBarrierSet* ct =
!     barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
    assert(sizeof(*ct->card_table()->byte_map_base()) == sizeof(jbyte), "adjust this code");
  
    Label done;
    Label runtime;