src/share/vm/gc_implementation/g1/heapRegion.cpp

rev 6923 : imported patch 8054819-rename-heapregionseq

*** 27,37 ****
  #include "gc_implementation/g1/g1BlockOffsetTable.inline.hpp"
  #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
  #include "gc_implementation/g1/g1OopClosures.inline.hpp"
  #include "gc_implementation/g1/heapRegion.inline.hpp"
  #include "gc_implementation/g1/heapRegionRemSet.hpp"
! #include "gc_implementation/g1/heapRegionSeq.inline.hpp"
  #include "gc_implementation/shared/liveRange.hpp"
  #include "memory/genOopClosures.inline.hpp"
  #include "memory/iterator.hpp"
  #include "memory/space.inline.hpp"
  #include "oops/oop.inline.hpp"
--- 27,37 ----
  #include "gc_implementation/g1/g1BlockOffsetTable.inline.hpp"
  #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
  #include "gc_implementation/g1/g1OopClosures.inline.hpp"
  #include "gc_implementation/g1/heapRegion.inline.hpp"
  #include "gc_implementation/g1/heapRegionRemSet.hpp"
! #include "gc_implementation/g1/heapRegionManager.inline.hpp"
  #include "gc_implementation/shared/liveRange.hpp"
  #include "memory/genOopClosures.inline.hpp"
  #include "memory/iterator.hpp"
  #include "memory/space.inline.hpp"
  #include "oops/oop.inline.hpp"
*** 343,357 ****
    }
    assert(low == high && low >= addr, "Didn't work.");
    return low;
  }
  
! HeapRegion::HeapRegion(uint hrs_index,
                         G1BlockOffsetSharedArray* sharedOffsetArray,
                         MemRegion mr) :
      G1OffsetTableContigSpace(sharedOffsetArray, mr),
!     _hrs_index(hrs_index),
      _humongous_type(NotHumongous), _humongous_start_region(NULL),
      _in_collection_set(false),
      _next_in_special_set(NULL), _orig_end(NULL),
      _claimed(InitialClaimValue), _evacuation_failed(false),
      _prev_marked_bytes(0), _next_marked_bytes(0), _gc_efficiency(0.0),
--- 343,357 ----
    }
    assert(low == high && low >= addr, "Didn't work.");
    return low;
  }
  
! HeapRegion::HeapRegion(uint hrm_index,
                         G1BlockOffsetSharedArray* sharedOffsetArray,
                         MemRegion mr) :
      G1OffsetTableContigSpace(sharedOffsetArray, mr),
!     _hrm_index(hrm_index),
      _humongous_type(NotHumongous), _humongous_start_region(NULL),
      _in_collection_set(false),
      _next_in_special_set(NULL), _orig_end(NULL),
      _claimed(InitialClaimValue), _evacuation_failed(false),
      _prev_marked_bytes(0), _next_marked_bytes(0), _gc_efficiency(0.0),