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

rev 7555 : [mq]: propagate_scanrs_closure
rev 7556 : [mq]: review-comments

*** 46,56 ****
  size_t HeapRegion::GrainBytes        = 0;
  size_t HeapRegion::GrainWords        = 0;
  size_t HeapRegion::CardsPerRegion    = 0;
  
  HeapRegionDCTOC::HeapRegionDCTOC(G1CollectedHeap* g1,
!                                  HeapRegion* hr, G1ParPushHeapRSClosure* cl,
                                   CardTableModRefBS::PrecisionStyle precision) :
    DirtyCardToOopClosure(hr, cl, precision, NULL),
    _hr(hr), _rs_scan(cl), _g1(g1) { }
  
  FilterOutOfRegionClosure::FilterOutOfRegionClosure(HeapRegion* r,
--- 46,57 ----
  size_t HeapRegion::GrainBytes        = 0;
  size_t HeapRegion::GrainWords        = 0;
  size_t HeapRegion::CardsPerRegion    = 0;
  
  HeapRegionDCTOC::HeapRegionDCTOC(G1CollectedHeap* g1,
!                                  HeapRegion* hr,
!                                  G1ParPushHeapRSClosure* cl,
                                   CardTableModRefBS::PrecisionStyle precision) :
    DirtyCardToOopClosure(hr, cl, precision, NULL),
    _hr(hr), _rs_scan(cl), _g1(g1) { }
  
  FilterOutOfRegionClosure::FilterOutOfRegionClosure(HeapRegion* r,
*** 91,101 ****
        cur_oop = oop(cur);
        oop_size = _hr->block_size(cur);
        next_obj = cur + oop_size;
      }
  
!     // Last object. Need to do pass a MemRegion here too.
      if (!g1h->is_obj_dead(oop(cur), _hr)) {
        oop(cur)->oop_iterate(_rs_scan, mr);
      }
    }
  }
--- 92,102 ----
        cur_oop = oop(cur);
        oop_size = _hr->block_size(cur);
        next_obj = cur + oop_size;
      }
  
!     // Last object. Need to do dead-obj filtering here too.
      if (!g1h->is_obj_dead(oop(cur), _hr)) {
        oop(cur)->oop_iterate(_rs_scan, mr);
      }
    }
  }