src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp

rev 6719 : imported patch fast-reclaim-main-patch
rev 6721 : [mq]: fixes1

*** 42,52 ****
  
  template <class T>
  inline void FilterIntoCSClosure::do_oop_nv(T* p) {
    T heap_oop = oopDesc::load_heap_oop(p);
    if (!oopDesc::is_null(heap_oop) &&
!       _g1->obj_in_cs(oopDesc::decode_heap_oop_not_null(heap_oop))) {
      _oc->do_oop(p);
    }
  }
  
  template <class T>
--- 42,52 ----
  
  template <class T>
  inline void FilterIntoCSClosure::do_oop_nv(T* p) {
    T heap_oop = oopDesc::load_heap_oop(p);
    if (!oopDesc::is_null(heap_oop) &&
!       _g1->is_in_cset_or_humongous(oopDesc::decode_heap_oop_not_null(heap_oop))) {
      _oc->do_oop(p);
    }
  }
  
  template <class T>
*** 65,75 ****
  inline void G1ParScanClosure::do_oop_nv(T* p) {
    T heap_oop = oopDesc::load_heap_oop(p);
  
    if (!oopDesc::is_null(heap_oop)) {
      oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
!     if (_g1->in_cset_fast_test(obj)) {
        // We're not going to even bother checking whether the object is
        // already forwarded or not, as this usually causes an immediate
        // stall. We'll try to prefetch the object (for write, given that
        // we might need to install the forwarding reference) and we'll
        // get back to it when pop it from the queue
--- 65,76 ----
  inline void G1ParScanClosure::do_oop_nv(T* p) {
    T heap_oop = oopDesc::load_heap_oop(p);
  
    if (!oopDesc::is_null(heap_oop)) {
      oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
!     G1FastCSetBiasedMappedArray::in_cset_state_t state = _g1->in_cset_state(obj);
!     if (state == G1FastCSetBiasedMappedArray::InCSet) {
        // We're not going to even bother checking whether the object is
        // already forwarded or not, as this usually causes an immediate
        // stall. We'll try to prefetch the object (for write, given that
        // we might need to install the forwarding reference) and we'll
        // get back to it when pop it from the queue
*** 84,93 ****
--- 85,97 ----
                   obj->forwardee() == oopDesc::load_decode_heap_oop(p)),
               "p should still be pointing to obj or to its forwardee");
  
        _par_scan_state->push_on_queue(p);
      } else {
+       if (state == G1FastCSetBiasedMappedArray::IsHumongous) {
+         _g1->set_humongous_is_live(obj);
+       }
        _par_scan_state->update_rs(_from, p, _worker_id);
      }
    }
  }
  
*** 95,110 ****
  inline void G1ParPushHeapRSClosure::do_oop_nv(T* p) {
    T heap_oop = oopDesc::load_heap_oop(p);
  
    if (!oopDesc::is_null(heap_oop)) {
      oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
!     if (_g1->in_cset_fast_test(obj)) {
        Prefetch::write(obj->mark_addr(), 0);
        Prefetch::read(obj->mark_addr(), (HeapWordSize*2));
  
        // Place on the references queue
        _par_scan_state->push_on_queue(p);
      }
    }
  }
  
  template <class T>
--- 99,116 ----
  inline void G1ParPushHeapRSClosure::do_oop_nv(T* p) {
    T heap_oop = oopDesc::load_heap_oop(p);
  
    if (!oopDesc::is_null(heap_oop)) {
      oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
!     if (_g1->is_in_cset_or_humongous(obj)) {
        Prefetch::write(obj->mark_addr(), 0);
        Prefetch::read(obj->mark_addr(), (HeapWordSize*2));
  
        // Place on the references queue
        _par_scan_state->push_on_queue(p);
+     } else {
+       assert(!_g1->obj_in_cs(obj), "checking");
      }
    }
  }
  
  template <class T>