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

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

*** 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
--- 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);
!     G1CollectedHeap::in_cset_state_t state = _g1->in_cset_state(obj);
!     if (state == G1CollectedHeap::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
*** 85,95 ****
                   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);
      }
    }
--- 85,95 ----
                   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 == G1CollectedHeap::IsHumongous) {
          _g1->set_humongous_is_live(obj);
        }
        _par_scan_state->update_rs(_from, p, _worker_id);
      }
    }