src/share/vm/memory/cardTableRS.cpp

rev 7525 : [mq]: noremset
rev 7526 : [mq]: update1

*** 31,58 ****
  #include "oops/oop.inline.hpp"
  #include "runtime/atomic.inline.hpp"
  #include "runtime/java.hpp"
  #include "runtime/os.hpp"
  #include "utilities/macros.hpp"
- #if INCLUDE_ALL_GCS
- #include "gc_implementation/g1/concurrentMark.hpp"
- #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
- #endif // INCLUDE_ALL_GCS
  
  CardTableRS::CardTableRS(MemRegion whole_heap) :
    GenRemSet(),
    _cur_youngergen_card_val(youngergenP1_card)
  {
! #if INCLUDE_ALL_GCS
!   if (UseG1GC) {
!       _ct_bs = new G1SATBCardTableLoggingModRefBS(whole_heap);
!   } else {
      _ct_bs = new CardTableModRefBSForCTRS(whole_heap);
-   }
- #else
-   _ct_bs = new CardTableModRefBSForCTRS(whole_heap);
- #endif
    _ct_bs->initialize();
    set_bs(_ct_bs);
    _last_cur_val_in_gen = NEW_C_HEAP_ARRAY3(jbyte, GenCollectedHeap::max_gens + 1,
                           mtGC, CURRENT_PC, AllocFailStrategy::RETURN_NULL);
    if (_last_cur_val_in_gen == NULL) {
--- 31,47 ----
  #include "oops/oop.inline.hpp"
  #include "runtime/atomic.inline.hpp"
  #include "runtime/java.hpp"
  #include "runtime/os.hpp"
  #include "utilities/macros.hpp"
  
  CardTableRS::CardTableRS(MemRegion whole_heap) :
    GenRemSet(),
    _cur_youngergen_card_val(youngergenP1_card)
  {
!   guarantee(UseSerialGC || UseConcMarkSweepGC, "sanity");
    _ct_bs = new CardTableModRefBSForCTRS(whole_heap);
    _ct_bs->initialize();
    set_bs(_ct_bs);
    _last_cur_val_in_gen = NEW_C_HEAP_ARRAY3(jbyte, GenCollectedHeap::max_gens + 1,
                           mtGC, CURRENT_PC, AllocFailStrategy::RETURN_NULL);
    if (_last_cur_val_in_gen == NULL) {