src/hotspot/share/gc/g1/heapRegion.cpp

rev 54087 : imported patch 8218668-reorganize-collection-set

*** 115,124 ****
--- 115,125 ----
           "we should have already filtered out humongous regions");
    assert(!in_collection_set(),
           "Should not clear heap region %u in the collection set", hrm_index());
  
    set_young_index_in_cset(-1);
+   clear_index_in_opt_cset();
    uninstall_surv_rate_group();
    set_free();
    reset_pre_dummy_top();
  
    if (!keep_remset) {
*** 239,249 ****
      _next(NULL), _prev(NULL),
  #ifdef ASSERT
      _containing_set(NULL),
  #endif
      _prev_marked_bytes(0), _next_marked_bytes(0), _gc_efficiency(0.0),
!     _index_in_opt_cset(G1OptionalCSet::InvalidCSetIndex), _young_index_in_cset(-1),
      _surv_rate_group(NULL), _age_index(-1),
      _prev_top_at_mark_start(NULL), _next_top_at_mark_start(NULL),
      _recorded_rs_length(0), _predicted_elapsed_time_ms(0)
  {
    _rem_set = new HeapRegionRemSet(bot, this);
--- 240,250 ----
      _next(NULL), _prev(NULL),
  #ifdef ASSERT
      _containing_set(NULL),
  #endif
      _prev_marked_bytes(0), _next_marked_bytes(0), _gc_efficiency(0.0),
!     _index_in_opt_cset(InvalidCSetIndex), _young_index_in_cset(-1),
      _surv_rate_group(NULL), _age_index(-1),
      _prev_top_at_mark_start(NULL), _next_top_at_mark_start(NULL),
      _recorded_rs_length(0), _predicted_elapsed_time_ms(0)
  {
    _rem_set = new HeapRegionRemSet(bot, this);