1.1 --- a/src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp Fri Oct 08 09:29:09 2010 -0700
1.2 +++ b/src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp Tue Oct 12 09:36:48 2010 -0700
1.3 @@ -30,16 +30,18 @@
1.4 }
1.5 }
1.6
1.7 -template <class T> inline void HRInto_G1RemSet::write_ref_nv(HeapRegion* from, T* p) {
1.8 +template <class T>
1.9 +inline void G1RemSet::write_ref_nv(HeapRegion* from, T* p) {
1.10 par_write_ref_nv(from, p, 0);
1.11 }
1.12
1.13 -inline bool HRInto_G1RemSet::self_forwarded(oop obj) {
1.14 +inline bool G1RemSet::self_forwarded(oop obj) {
1.15 bool result = (obj->is_forwarded() && (obj->forwardee()== obj));
1.16 return result;
1.17 }
1.18
1.19 -template <class T> inline void HRInto_G1RemSet::par_write_ref_nv(HeapRegion* from, T* p, int tid) {
1.20 +template <class T>
1.21 +inline void G1RemSet::par_write_ref_nv(HeapRegion* from, T* p, int tid) {
1.22 oop obj = oopDesc::load_decode_heap_oop(p);
1.23 #ifdef ASSERT
1.24 // can't do because of races
1.25 @@ -77,7 +79,7 @@
1.26 // Deferred updates to the CSet are either discarded (in the normal case),
1.27 // or processed (if an evacuation failure occurs) at the end
1.28 // of the collection.
1.29 - // See HRInto_G1RemSet::cleanup_after_oops_into_collection_set_do().
1.30 + // See G1RemSet::cleanup_after_oops_into_collection_set_do().
1.31 } else {
1.32 #if G1_REM_SET_LOGGING
1.33 gclog_or_tty->print_cr("Adding " PTR_FORMAT " (" PTR_FORMAT ") to RS"
1.34 @@ -91,12 +93,14 @@
1.35 }
1.36 }
1.37
1.38 -template <class T> inline void UpdateRSOopClosure::do_oop_work(T* p) {
1.39 +template <class T>
1.40 +inline void UpdateRSOopClosure::do_oop_work(T* p) {
1.41 assert(_from != NULL, "from region must be non-NULL");
1.42 _rs->par_write_ref(_from, p, _worker_i);
1.43 }
1.44
1.45 -template <class T> inline void UpdateRSetImmediate::do_oop_work(T* p) {
1.46 +template <class T>
1.47 +inline void UpdateRSetImmediate::do_oop_work(T* p) {
1.48 assert(_from->is_in_reserved(p), "paranoia");
1.49 T heap_oop = oopDesc::load_heap_oop(p);
1.50 if (!oopDesc::is_null(heap_oop) && !_from->is_survivor()) {
