7022200: G1: optimized build broken
Summary: Make the G1 specific version of is_in_closed_subset() available in all builds.
Reviewed-by: tonyp, jcoomes
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Fri Feb 25 10:58:03 2011 -0500
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Mon Feb 28 09:10:52 2011 -0800
@@ -5474,8 +5474,6 @@
_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 @@
return hr->is_in(p);
}
}
-#endif // ASSERT
class VerifyRegionListsClosure : public HeapRegionClosure {
private:
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Fri Feb 25 10:58:03 2011 -0500
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Mon Feb 28 09:10:52 2011 -0800
@@ -1134,7 +1134,7 @@
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);