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

rev 52676 : imported patch AMGC-impl

*** 24,33 ****
--- 24,34 ----
  
  #include "precompiled.hpp"
  #include "code/nmethod.hpp"
  #include "gc/g1/g1BlockOffsetTable.inline.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
+ #include "gc/g1/g1CollectionSet.hpp"
  #include "gc/g1/g1HeapRegionTraceType.hpp"
  #include "gc/g1/g1OopClosures.inline.hpp"
  #include "gc/g1/heapRegion.inline.hpp"
  #include "gc/g1/heapRegionBounds.inline.hpp"
  #include "gc/g1/heapRegionManager.inline.hpp"
*** 238,248 ****
      _next(NULL), _prev(NULL),
  #ifdef ASSERT
      _containing_set(NULL),
  #endif
      _prev_marked_bytes(0), _next_marked_bytes(0), _gc_efficiency(0.0),
!     _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);
  
--- 239,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(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);