Mercurial > hg > graal-compiler
diff src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp @ 994:753cf9794df9
6885169: merge of 4957990 and 6863023 causes conflict on do_nmethods
Summary: After mechanically merging changes, some by-hand adjustments are needed.
Reviewed-by: ysr
| author | jrose |
|---|---|
| date | Wed, 23 Sep 2009 23:57:44 -0700 |
| parents | 54b3b351d6f9 |
| children | c18cbe5936b8 |
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp Wed Sep 23 23:56:15 2009 -0700 +++ b/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp Wed Sep 23 23:57:44 2009 -0700 @@ -47,13 +47,10 @@ private: const MemRegion _span; CMSBitMap* _bitMap; - const bool _should_do_nmethods; protected: DO_OOP_WORK_DEFN public: - MarkRefsIntoClosure(MemRegion span, CMSBitMap* bitMap, - bool should_do_nmethods); - bool should_do_nmethods() { return _should_do_nmethods; } + MarkRefsIntoClosure(MemRegion span, CMSBitMap* bitMap); virtual void do_oop(oop* p); virtual void do_oop(narrowOop* p); inline void do_oop_nv(oop* p) { MarkRefsIntoClosure::do_oop_work(p); } @@ -71,13 +68,11 @@ const MemRegion _span; CMSBitMap* _verification_bm; CMSBitMap* _cms_bm; - const bool _should_do_nmethods; protected: DO_OOP_WORK_DEFN public: MarkRefsIntoVerifyClosure(MemRegion span, CMSBitMap* verification_bm, - CMSBitMap* cms_bm, bool should_do_nmethods); - bool should_do_nmethods() { return _should_do_nmethods; } + CMSBitMap* cms_bm); virtual void do_oop(oop* p); virtual void do_oop(narrowOop* p); inline void do_oop_nv(oop* p) { MarkRefsIntoVerifyClosure::do_oop_work(p); } @@ -268,7 +263,6 @@ inline void do_oop_nv(oop* p) { Par_MarkRefsIntoAndScanClosure::do_oop_work(p); } inline void do_oop_nv(narrowOop* p) { Par_MarkRefsIntoAndScanClosure::do_oop_work(p); } bool do_header() { return true; } - virtual const bool do_nmethods() const { return true; } // When ScanMarkedObjectsAgainClosure is used, // it passes [Par_]MarkRefsIntoAndScanClosure to oop_oop_iterate(), // and this delegation is used.