1.1 --- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Tue Apr 01 07:46:51 2014 +0200
1.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Tue Aug 19 12:39:06 2014 +0200
1.3 @@ -1490,17 +1490,15 @@
1.4 // space containing a given address, or else returns NULL.
1.5 virtual Space* space_containing(const void* addr) const;
1.6
1.7 - // A G1CollectedHeap will contain some number of heap regions. This
1.8 - // finds the region containing a given address, or else returns NULL.
1.9 + // Returns the HeapRegion that contains addr. addr must not be NULL.
1.10 + template <class T>
1.11 + inline HeapRegion* heap_region_containing_raw(const T addr) const;
1.12 +
1.13 + // Returns the HeapRegion that contains addr. addr must not be NULL.
1.14 + // If addr is within a humongous continues region, it returns its humongous start region.
1.15 template <class T>
1.16 inline HeapRegion* heap_region_containing(const T addr) const;
1.17
1.18 - // Like the above, but requires "addr" to be in the heap (to avoid a
1.19 - // null-check), and unlike the above, may return an continuing humongous
1.20 - // region.
1.21 - template <class T>
1.22 - inline HeapRegion* heap_region_containing_raw(const T addr) const;
1.23 -
1.24 // A CollectedHeap is divided into a dense sequence of "blocks"; that is,
1.25 // each address in the (reserved) heap is a member of exactly
1.26 // one block. The defining characteristic of a block is that it is
1.27 @@ -1642,7 +1640,6 @@
1.28 // the region to which the object belongs. An object is dead
1.29 // iff a) it was not allocated since the last mark and b) it
1.30 // is not marked.
1.31 -
1.32 bool is_obj_dead(const oop obj, const HeapRegion* hr) const {
1.33 return
1.34 !hr->obj_allocated_since_prev_marking(obj) &&
1.35 @@ -1652,7 +1649,6 @@
1.36 // This function returns true when an object has been
1.37 // around since the previous marking and hasn't yet
1.38 // been marked during this marking.
1.39 -
1.40 bool is_obj_ill(const oop obj, const HeapRegion* hr) const {
1.41 return
1.42 !hr->obj_allocated_since_next_marking(obj) &&
