src/hotspot/share/gc/g1/heapRegion.inline.hpp

rev 56987 : [mq]: 8233588-kbarrett-review

*** 371,384 ****
    }
  }
  
  inline int HeapRegion::age_in_surv_rate_group() const {
    assert(has_surv_rate_group(), "pre-condition");
!   assert(SurvRateGroup::is_valid_age_index(_age_index), "pre-condition");
    return _surv_rate_group->age_in_group(_age_index);
  }
  
  inline bool HeapRegion::has_surv_rate_group() const {
    return _surv_rate_group != NULL;
  }
    
  inline double HeapRegion::surv_rate_prediction(G1Predictions const& predictor) const {
--- 371,388 ----
    }
  }
  
  inline int HeapRegion::age_in_surv_rate_group() const {
    assert(has_surv_rate_group(), "pre-condition");
!   assert(has_valid_age_in_surv_rate(), "pre-condition");
    return _surv_rate_group->age_in_group(_age_index);
  }
  
+ inline bool HeapRegion::has_valid_age_in_surv_rate() const {
+   return SurvRateGroup::is_valid_age_index(_age_index);
+ }
+ 
  inline bool HeapRegion::has_surv_rate_group() const {
    return _surv_rate_group != NULL;
  }
    
  inline double HeapRegion::surv_rate_prediction(G1Predictions const& predictor) const {
*** 395,417 ****
    _age_index = surv_rate_group->next_age_index();
  }
  
  inline void HeapRegion::uninstall_surv_rate_group() {
    if (has_surv_rate_group()) {
!     assert(SurvRateGroup::is_valid_age_index(_age_index), "pre-condition");
      assert(is_young(), "pre-condition");
  
      _surv_rate_group = NULL;
      _age_index = SurvRateGroup::InvalidAgeIndex;
    } else {
!     assert(!SurvRateGroup::is_valid_age_index(_age_index), "pre-condition");
    }
  }
  
  inline void HeapRegion::record_surv_words_in_group(size_t words_survived) {
    assert(has_surv_rate_group(), "pre-condition");
!   assert(SurvRateGroup::is_valid_age_index(_age_index), "pre-condition");
    int age_in_group = age_in_surv_rate_group();
    _surv_rate_group->record_surviving_words(age_in_group, words_survived);
  }
  
  #endif // SHARE_GC_G1_HEAPREGION_INLINE_HPP
--- 399,421 ----
    _age_index = surv_rate_group->next_age_index();
  }
  
  inline void HeapRegion::uninstall_surv_rate_group() {
    if (has_surv_rate_group()) {
!     assert(has_valid_age_in_surv_rate(), "pre-condition");
      assert(is_young(), "pre-condition");
  
      _surv_rate_group = NULL;
      _age_index = SurvRateGroup::InvalidAgeIndex;
    } else {
!     assert(!has_valid_age_in_surv_rate(), "pre-condition");
    }
  }
  
  inline void HeapRegion::record_surv_words_in_group(size_t words_survived) {
    assert(has_surv_rate_group(), "pre-condition");
!   assert(has_valid_age_in_surv_rate(), "pre-condition");
    int age_in_group = age_in_surv_rate_group();
    _surv_rate_group->record_surviving_words(age_in_group, words_survived);
  }
  
  #endif // SHARE_GC_G1_HEAPREGION_INLINE_HPP