Mercurial > hg > truffle
changeset 2312:11303bede852
Merge
| author | jcoomes |
|---|---|
| date | Thu, 03 Mar 2011 21:02:56 -0800 |
| parents | 8c0d0510d36f (current diff) 4e0069ff33df (diff) |
| children | 8c9c9ee30d71 1216415d8e35 |
| files | |
| diffstat | 2 files changed, 1 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Thu Mar 03 09:31:46 2011 -0800 +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Thu Mar 03 21:02:56 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/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Thu Mar 03 09:31:46 2011 -0800 +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Thu Mar 03 21:02:56 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);