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

rev 7807 : [mq]: bcast

*** 191,201 ****
    assert(used() == 0, "the region should have been already cleared");
    assert(capacity() == HeapRegion::GrainBytes, "should be back to normal");
    HeapRegionRemSet* hrrs = rem_set();
    hrrs->clear();
    CardTableModRefBS* ct_bs =
!                    (CardTableModRefBS*)G1CollectedHeap::heap()->barrier_set();
    ct_bs->clear(MemRegion(bottom(), end()));
  }
  
  void HeapRegion::calc_gc_efficiency() {
    // GC efficiency is the ratio of how much space would be
--- 191,201 ----
    assert(used() == 0, "the region should have been already cleared");
    assert(capacity() == HeapRegion::GrainBytes, "should be back to normal");
    HeapRegionRemSet* hrrs = rem_set();
    hrrs->clear();
    CardTableModRefBS* ct_bs =
!     barrier_set_cast<CardTableModRefBS>(G1CollectedHeap::heap()->barrier_set());
    ct_bs->clear(MemRegion(bottom(), end()));
  }
  
  void HeapRegion::calc_gc_efficiency() {
    // GC efficiency is the ratio of how much space would be
*** 641,657 ****
  public:
    // _vo == UsePrevMarking -> use "prev" marking information,
    // _vo == UseNextMarking -> use "next" marking information,
    // _vo == UseMarkWord    -> use mark word from object header.
    VerifyLiveClosure(G1CollectedHeap* g1h, VerifyOption vo) :
!     _g1h(g1h), _bs(NULL), _containing_obj(NULL),
!     _failures(false), _n_failures(0), _vo(vo)
!   {
!     BarrierSet* bs = _g1h->barrier_set();
!     if (bs->is_a(BarrierSet::CardTableModRef))
!       _bs = (CardTableModRefBS*)bs;
!   }
  
    void set_containing_obj(oop obj) {
      _containing_obj = obj;
    }
  
--- 641,653 ----
  public:
    // _vo == UsePrevMarking -> use "prev" marking information,
    // _vo == UseNextMarking -> use "next" marking information,
    // _vo == UseMarkWord    -> use mark word from object header.
    VerifyLiveClosure(G1CollectedHeap* g1h, VerifyOption vo) :
!     _g1h(g1h), _bs(barrier_set_cast<CardTableModRefBS>(g1h->barrier_set())),
!     _containing_obj(NULL), _failures(false), _n_failures(0), _vo(vo)
!   { }
  
    void set_containing_obj(oop obj) {
      _containing_obj = obj;
    }