src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp

rev 5917 : 8027559: Decrease code size and templatizing in G1ParCopyClosure::do_oop_work
Summary: Move methods that are not dependent on any of G1ParCopyClosure's template parameters into G1ParCopyHelper. Further remove unused methods and members of the class hierarchy.
Reviewed-by:
rev 5918 : 8035326: Assume non-NULL references in G1CollectedHeap::in_cset_fast_test
Summary: Remove the assumption that G1CollectedHeap::in_cset_fast_test needs to check for NULL references. Most of the time this is not required, making the code doing this check multiple times.
Reviewed-by:

*** 4787,4801 ****
  }
  
  template <G1Barrier barrier, bool do_mark_object>
  template <class T>
  void G1ParCopyClosure<barrier, do_mark_object>::do_oop_work(T* p) {
!   oop obj = oopDesc::load_decode_heap_oop(p);
  
    assert(_worker_id == _par_scan_state->queue_num(), "sanity");
  
-   // here the null check is implicit in the cset_fast_test() test
    if (_g1->in_cset_fast_test(obj)) {
      oop forwardee;
      if (obj->is_forwarded()) {
        forwardee = obj->forwardee();
      } else {
--- 4787,4803 ----
  }
  
  template <G1Barrier barrier, bool do_mark_object>
  template <class T>
  void G1ParCopyClosure<barrier, do_mark_object>::do_oop_work(T* p) {
!   T heap_oop = oopDesc::load_heap_oop(p);
! 
!   if (!oopDesc::is_null(heap_oop)) {
!     oop obj = oopDesc::load_decode_heap_oop_not_null(p);
  
      assert(_worker_id == _par_scan_state->queue_num(), "sanity");
  
      if (_g1->in_cset_fast_test(obj)) {
        oop forwardee;
        if (obj->is_forwarded()) {
          forwardee = obj->forwardee();
        } else {
*** 4814,4831 ****
      }
    } else {
      // The object is not in collection set. If we're a root scanning
      // closure during an initial mark pause (i.e. do_mark_object will
      // be true) then attempt to mark the object.
!     if (do_mark_object && _g1->is_in_g1_reserved(obj)) {
        mark_object(obj);
      }
    }
  
!   if (barrier == G1BarrierEvac && obj != NULL) {
      _par_scan_state->update_rs(_from, p, _worker_id);
    }
  }
  
  template void G1ParCopyClosure<G1BarrierEvac, false>::do_oop_work(oop* p);
  template void G1ParCopyClosure<G1BarrierEvac, false>::do_oop_work(narrowOop* p);
  
--- 4816,4836 ----
        }
      } else {
        // The object is not in collection set. If we're a root scanning
        // closure during an initial mark pause (i.e. do_mark_object will
        // be true) then attempt to mark the object.
!       if (do_mark_object) {
!         assert(_g1->is_in_g1_reserved(obj), "Must reference an object within the heap");
          mark_object(obj);
        }
      }
  
!     if (barrier == G1BarrierEvac) {
!       assert(obj != NULL, "must be");
        _par_scan_state->update_rs(_from, p, _worker_id);
      }
+   }
  }
  
  template void G1ParCopyClosure<G1BarrierEvac, false>::do_oop_work(oop* p);
  template void G1ParCopyClosure<G1BarrierEvac, false>::do_oop_work(narrowOop* p);