src/share/vm/gc/g1/youngList.cpp

rev 10311 : 8151178 Move the collection set out of the G1 collector policy
Reviewed-by:
rev 10312 : imported patch remove-cset-from-name

*** 22,31 ****
--- 22,32 ----
   *
   */
  
  #include "precompiled.hpp"
  #include "gc/g1/g1CollectedHeap.hpp"
+ #include "gc/g1/g1CollectionSet.hpp"
  #include "gc/g1/g1CollectorPolicy.hpp"
  #include "gc/g1/heapRegion.hpp"
  #include "gc/g1/heapRegion.inline.hpp"
  #include "gc/g1/heapRegionRemSet.hpp"
  #include "gc/g1/youngList.hpp"
*** 151,161 ****
      _g1h->g1_policy()->set_region_survivor(curr, young_index_in_cset);
  
      // The region is a non-empty survivor so let's add it to
      // the incremental collection set for the next evacuation
      // pause.
!     _g1h->g1_policy()->add_region_to_incremental_cset_rhs(curr);
      young_index_in_cset += 1;
    }
    assert((uint) young_index_in_cset == _survivor_length, "post-condition");
    _g1h->g1_policy()->note_stop_adding_survivor_regions();
  
--- 152,162 ----
      _g1h->g1_policy()->set_region_survivor(curr, young_index_in_cset);
  
      // The region is a non-empty survivor so let's add it to
      // the incremental collection set for the next evacuation
      // pause.
!     _g1h->collection_set()->add_survivor_regions(curr);
      young_index_in_cset += 1;
    }
    assert((uint) young_index_in_cset == _survivor_length, "post-condition");
    _g1h->g1_policy()->note_stop_adding_survivor_regions();