src/share/vm/memory/cardTableRS.cpp

rev 8070 : imported patch gencollected_heap_cleanup

*** 36,46 ****
  
  CardTableRS::CardTableRS(MemRegion whole_heap) :
    GenRemSet(),
    _cur_youngergen_card_val(youngergenP1_card)
  {
-   guarantee(Universe::heap()->kind() == CollectedHeap::GenCollectedHeap, "sanity");
    _ct_bs = new CardTableModRefBSForCTRS(whole_heap);
    _ct_bs->initialize();
    set_bs(_ct_bs);
    // max_gens is really GenCollectedHeap::heap()->gen_policy()->number_of_generations()
    // (which is always 2, young & old), but GenCollectedHeap has not been initialized yet.
--- 36,45 ----
*** 592,603 ****
  
  void CardTableRS::verify() {
    // At present, we only know how to verify the card table RS for
    // generational heaps.
    VerifyCTGenClosure blk(this);
-   CollectedHeap* ch = Universe::heap();
- 
-   if (ch->kind() == CollectedHeap::GenCollectedHeap) {
      GenCollectedHeap::heap()->generation_iterate(&blk, false);
      _ct_bs->verify();
!     }
!   }
--- 591,598 ----
  
  void CardTableRS::verify() {
    // At present, we only know how to verify the card table RS for
    // generational heaps.
    VerifyCTGenClosure blk(this);
    GenCollectedHeap::heap()->generation_iterate(&blk, false);
    _ct_bs->verify();
! }