1.1 --- a/src/share/vm/gc_implementation/g1/g1RemSet.cpp Wed Jun 08 15:31:51 2011 -0400
1.2 +++ b/src/share/vm/gc_implementation/g1/g1RemSet.cpp Wed Jun 08 21:48:38 2011 -0400
1.3 @@ -66,41 +66,6 @@
1.4 }
1.5 #endif
1.6
1.7 -
1.8 -class IntoCSOopClosure: public OopsInHeapRegionClosure {
1.9 - OopsInHeapRegionClosure* _blk;
1.10 - G1CollectedHeap* _g1;
1.11 -public:
1.12 - IntoCSOopClosure(G1CollectedHeap* g1, OopsInHeapRegionClosure* blk) :
1.13 - _g1(g1), _blk(blk) {}
1.14 - void set_region(HeapRegion* from) {
1.15 - _blk->set_region(from);
1.16 - }
1.17 - virtual void do_oop(narrowOop* p) { do_oop_work(p); }
1.18 - virtual void do_oop( oop* p) { do_oop_work(p); }
1.19 - template <class T> void do_oop_work(T* p) {
1.20 - oop obj = oopDesc::load_decode_heap_oop(p);
1.21 - if (_g1->obj_in_cs(obj)) _blk->do_oop(p);
1.22 - }
1.23 - bool apply_to_weak_ref_discovered_field() { return true; }
1.24 - bool idempotent() { return true; }
1.25 -};
1.26 -
1.27 -class VerifyRSCleanCardOopClosure: public OopClosure {
1.28 - G1CollectedHeap* _g1;
1.29 -public:
1.30 - VerifyRSCleanCardOopClosure(G1CollectedHeap* g1) : _g1(g1) {}
1.31 -
1.32 - virtual void do_oop(narrowOop* p) { do_oop_work(p); }
1.33 - virtual void do_oop( oop* p) { do_oop_work(p); }
1.34 - template <class T> void do_oop_work(T* p) {
1.35 - oop obj = oopDesc::load_decode_heap_oop(p);
1.36 - HeapRegion* to = _g1->heap_region_containing(obj);
1.37 - guarantee(to == NULL || !to->in_collection_set(),
1.38 - "Missed a rem set member.");
1.39 - }
1.40 -};
1.41 -
1.42 G1RemSet::G1RemSet(G1CollectedHeap* g1, CardTableModRefBS* ct_bs)
1.43 : _g1(g1), _conc_refine_cards(0),
1.44 _ct_bs(ct_bs), _g1p(_g1->g1_policy()),
