src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp

rev 6589 : 8047818: G1 HeapRegions can no longer be ContiguousSpaces
Reviewed-by:

*** 24,34 ****
  
  #ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
  #define SHARE_VM_GC_IMPLEMENTATION_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
  
  #include "gc_implementation/g1/g1BlockOffsetTable.hpp"
! #include "gc_implementation/g1/heapRegion.hpp"
  #include "memory/space.hpp"
  
  inline HeapWord* G1BlockOffsetTable::block_start(const void* addr) {
    if (addr >= _bottom && addr < _end) {
      return block_start_unsafe(addr);
--- 24,35 ----
  
  #ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
  #define SHARE_VM_GC_IMPLEMENTATION_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
  
  #include "gc_implementation/g1/g1BlockOffsetTable.hpp"
! #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
! #include "gc_implementation/g1/heapRegion.inline.hpp"
  #include "memory/space.hpp"
  
  inline HeapWord* G1BlockOffsetTable::block_start(const void* addr) {
    if (addr >= _bottom && addr < _end) {
      return block_start_unsafe(addr);