Mercurial > hg > graal-jvmci-8
diff src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp @ 1861:c32059ef4dc0
6971296: G1: simplify G1RemSet class hierarchy
Summary: Remove G1RemSet base class and StupidG1RemSet class; rename HRInto_G1RemSet to just G1RemSet.
Reviewed-by: ysr, tonyp
author | johnc |
---|---|
date | Tue, 12 Oct 2010 09:36:48 -0700 |
parents | a03ae377b2e8 |
children | 878b57474103 |
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp Fri Oct 08 09:29:09 2010 -0700 +++ b/src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp Tue Oct 12 09:36:48 2010 -0700 @@ -30,16 +30,18 @@ } } -template <class T> inline void HRInto_G1RemSet::write_ref_nv(HeapRegion* from, T* p) { +template <class T> +inline void G1RemSet::write_ref_nv(HeapRegion* from, T* p) { par_write_ref_nv(from, p, 0); } -inline bool HRInto_G1RemSet::self_forwarded(oop obj) { +inline bool G1RemSet::self_forwarded(oop obj) { bool result = (obj->is_forwarded() && (obj->forwardee()== obj)); return result; } -template <class T> inline void HRInto_G1RemSet::par_write_ref_nv(HeapRegion* from, T* p, int tid) { +template <class T> +inline void G1RemSet::par_write_ref_nv(HeapRegion* from, T* p, int tid) { oop obj = oopDesc::load_decode_heap_oop(p); #ifdef ASSERT // can't do because of races @@ -77,7 +79,7 @@ // Deferred updates to the CSet are either discarded (in the normal case), // or processed (if an evacuation failure occurs) at the end // of the collection. - // See HRInto_G1RemSet::cleanup_after_oops_into_collection_set_do(). + // See G1RemSet::cleanup_after_oops_into_collection_set_do(). } else { #if G1_REM_SET_LOGGING gclog_or_tty->print_cr("Adding " PTR_FORMAT " (" PTR_FORMAT ") to RS" @@ -91,12 +93,14 @@ } } -template <class T> inline void UpdateRSOopClosure::do_oop_work(T* p) { +template <class T> +inline void UpdateRSOopClosure::do_oop_work(T* p) { assert(_from != NULL, "from region must be non-NULL"); _rs->par_write_ref(_from, p, _worker_i); } -template <class T> inline void UpdateRSetImmediate::do_oop_work(T* p) { +template <class T> +inline void UpdateRSetImmediate::do_oop_work(T* p) { assert(_from->is_in_reserved(p), "paranoia"); T heap_oop = oopDesc::load_heap_oop(p); if (!oopDesc::is_null(heap_oop) && !_from->is_survivor()) {