src/hotspot/share/gc/g1/g1CollectedHeap.hpp

rev 52310 : imported patch 8071913-almost-done

*** 1118,1127 ****
--- 1118,1128 ----
    // iteration early if the "do_heap_region" method returns "true".
    void heap_region_iterate(HeapRegionClosure* blk) const;
  
    // Return the region with the given index. It assumes the index is valid.
    inline HeapRegion* region_at(uint index) const;
+   inline HeapRegion* region_at_or_null(uint index) const;
  
    // Return the next region (by index) that is part of the same
    // humongous object that hr is part of.
    inline HeapRegion* next_region_in_humongous(HeapRegion* hr) const;
  
*** 1155,1164 ****
--- 1156,1170 ----
  
    // Returns the HeapRegion that contains addr. addr must not be NULL.
    template <class T>
    inline HeapRegion* heap_region_containing(const T addr) const;
  
+   // Returns the HeapRegion that contains addr, or NULL if that is an uncommitted
+   // region. addr must not be NULL.
+   template <class T>
+   inline HeapRegion* heap_region_containing_or_null(const T addr) const;
+ 
    // A CollectedHeap is divided into a dense sequence of "blocks"; that is,
    // each address in the (reserved) heap is a member of exactly
    // one block.  The defining characteristic of a block is that it is
    // possible to find its size, and thus to progress forward to the next
    // block.  (Blocks may be of different sizes.)  Thus, blocks may