1.1 --- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp Wed Aug 27 09:36:55 2014 +0200
1.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp Tue Aug 26 09:36:53 2014 +0200
1.3 @@ -30,15 +30,15 @@
1.4 #include "gc_implementation/g1/g1AllocRegion.inline.hpp"
1.5 #include "gc_implementation/g1/g1CollectorPolicy.hpp"
1.6 #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
1.7 +#include "gc_implementation/g1/heapRegionManager.inline.hpp"
1.8 #include "gc_implementation/g1/heapRegionSet.inline.hpp"
1.9 -#include "gc_implementation/g1/heapRegionSeq.inline.hpp"
1.10 #include "runtime/orderAccess.inline.hpp"
1.11 #include "utilities/taskqueue.hpp"
1.12
1.13 // Inline functions for G1CollectedHeap
1.14
1.15 // Return the region with the given index. It assumes the index is valid.
1.16 -inline HeapRegion* G1CollectedHeap::region_at(uint index) const { return _hrs.at(index); }
1.17 +inline HeapRegion* G1CollectedHeap::region_at(uint index) const { return _hrm.at(index); }
1.18
1.19 inline uint G1CollectedHeap::addr_to_region(HeapWord* addr) const {
1.20 assert(is_in_reserved(addr),
1.21 @@ -48,7 +48,7 @@
1.22 }
1.23
1.24 inline HeapWord* G1CollectedHeap::bottom_addr_for_region(uint index) const {
1.25 - return _hrs.reserved().start() + index * HeapRegion::GrainWords;
1.26 + return _hrm.reserved().start() + index * HeapRegion::GrainWords;
1.27 }
1.28
1.29 template <class T>
1.30 @@ -57,7 +57,7 @@
1.31 assert(is_in_g1_reserved((const void*) addr),
1.32 err_msg("Address "PTR_FORMAT" is outside of the heap ranging from ["PTR_FORMAT" to "PTR_FORMAT")",
1.33 p2i((void*)addr), p2i(g1_reserved().start()), p2i(g1_reserved().end())));
1.34 - return _hrs.addr_to_region((HeapWord*) addr);
1.35 + return _hrm.addr_to_region((HeapWord*) addr);
1.36 }
1.37
1.38 template <class T>
1.39 @@ -87,7 +87,7 @@
1.40 }
1.41
1.42 inline bool G1CollectedHeap::obj_in_cs(oop obj) {
1.43 - HeapRegion* r = _hrs.addr_to_region((HeapWord*) obj);
1.44 + HeapRegion* r = _hrm.addr_to_region((HeapWord*) obj);
1.45 return r != NULL && r->in_collection_set();
1.46 }
1.47
