diff options
author | johnc <none@none> | 2011-02-28 09:10:52 -0800 |
---|---|---|
committer | johnc <none@none> | 2011-02-28 09:10:52 -0800 |
commit | 3559cca619ad598e9adac79b418b1cf9e80bafaa (patch) | |
tree | e199affe28b90c1e7bcc1f588ce01db1ddc52eca | |
parent | 9feb4cb49596e836985a81e75a99184a28ea70b5 (diff) |
7022200: G1: optimized build broken
Summary: Make the G1 specific version of is_in_closed_subset() available in all builds.
Reviewed-by: tonyp, jcoomes
-rw-r--r-- | src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp | 3 | ||||
-rw-r--r-- | src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp index a4f01adf0..e34d7270e 100644 --- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp @@ -5474,8 +5474,6 @@ void G1CollectedHeap::set_refine_cte_cl_concurrency(bool concurrent) { _refine_cte_cl->set_concurrent(concurrent); } -#ifdef ASSERT - bool G1CollectedHeap::is_in_closed_subset(const void* p) const { HeapRegion* hr = heap_region_containing(p); if (hr == NULL) { @@ -5484,7 +5482,6 @@ bool G1CollectedHeap::is_in_closed_subset(const void* p) const { return hr->is_in(p); } } -#endif // ASSERT class VerifyRegionListsClosure : public HeapRegionClosure { private: diff --git a/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp b/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp index e31858569..93b26c0eb 100644 --- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp @@ -1134,7 +1134,7 @@ public: return _g1_committed; } - NOT_PRODUCT(bool is_in_closed_subset(const void* p) const;) + virtual bool is_in_closed_subset(const void* p) const; // Dirty card table entries covering a list of young regions. void dirtyCardsForYoungRegions(CardTableModRefBS* ct_bs, HeapRegion* list); |