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

rev 54468 : [mq]: 8221509.webrev.0

*** 484,497 ****
    update_survivors_policy();
  
    assert(max_survivor_regions() + _g1h->num_used_regions() <= _g1h->max_regions(),
           "Maximum survivor regions %u plus used regions %u exceeds max regions %u",
           max_survivor_regions(), _g1h->num_used_regions(), _g1h->max_regions());
! 
!   assert(_g1h->used() == _g1h->recalculate_used(),
!          "sanity, used: " SIZE_FORMAT " recalculate_used: " SIZE_FORMAT,
!          _g1h->used(), _g1h->recalculate_used());
  
    phase_times()->record_cur_collection_start_sec(start_time_sec);
    _pending_cards = _g1h->pending_card_num();
  
    _collection_set->reset_bytes_used_before();
--- 484,494 ----
    update_survivors_policy();
  
    assert(max_survivor_regions() + _g1h->num_used_regions() <= _g1h->max_regions(),
           "Maximum survivor regions %u plus used regions %u exceeds max regions %u",
           max_survivor_regions(), _g1h->num_used_regions(), _g1h->max_regions());
!   assert_used_and_recalculate_used(_g1h);
  
    phase_times()->record_cur_collection_start_sec(start_time_sec);
    _pending_cards = _g1h->pending_card_num();
  
    _collection_set->reset_bytes_used_before();
*** 578,589 ****
  #define MIN_TIMER_GRANULARITY 0.0000001
  
  void G1Policy::record_collection_pause_end(double pause_time_ms, size_t cards_scanned, size_t heap_used_bytes_before_gc) {
    double end_time_sec = os::elapsedTime();
  
    size_t cur_used_bytes = _g1h->used();
-   assert(cur_used_bytes == _g1h->recalculate_used(), "It should!");
    bool this_pause_included_initial_mark = false;
    bool this_pause_was_young_only = collector_state()->in_young_only_phase();
  
    bool update_stats = !_g1h->evacuation_failed();
  
--- 575,586 ----
  #define MIN_TIMER_GRANULARITY 0.0000001
  
  void G1Policy::record_collection_pause_end(double pause_time_ms, size_t cards_scanned, size_t heap_used_bytes_before_gc) {
    double end_time_sec = os::elapsedTime();
  
+   assert_used_and_recalculate_used(_g1h);
    size_t cur_used_bytes = _g1h->used();
    bool this_pause_included_initial_mark = false;
    bool this_pause_was_young_only = collector_state()->in_young_only_phase();
  
    bool update_stats = !_g1h->evacuation_failed();