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

rev 11265 : 8142749: HeapRegion::_predicted_bytes_to_copy is unused and can be removed
Reviewed-by: ?
Contributed-by: Vsevolod Tolstopyatov <qwwdfsad@gmail.com>

*** 214,244 ****
  
      return rspc.marked_bytes();
    }
  
    bool doHeapRegion(HeapRegion *hr) {
-     bool during_initial_mark = _g1h->collector_state()->during_initial_mark_pause();
-     bool during_conc_mark = _g1h->collector_state()->mark_in_progress();
- 
      assert(!hr->is_pinned(), "Unexpected pinned region at index %u", hr->hrm_index());
      assert(hr->in_collection_set(), "bad CS");
  
      if (_hrclaimer->claim_region(hr->hrm_index())) {
        if (hr->evacuation_failed()) {
          hr->note_self_forwarding_removal_start(during_initial_mark,
                                                 during_conc_mark);
          _g1h->verifier()->check_bitmaps("Self-Forwarding Ptr Removal", hr);
  
          hr->reset_bot();
  
          size_t live_bytes = remove_self_forward_ptr_by_walking_hr(hr, during_initial_mark);
  
          hr->rem_set()->clean_strong_code_roots(hr);
  
!         hr->note_self_forwarding_removal_end(during_initial_mark,
!                                              during_conc_mark,
!                                              live_bytes);
        }
      }
      return false;
    }
  };
--- 214,242 ----
  
      return rspc.marked_bytes();
    }
  
    bool doHeapRegion(HeapRegion *hr) {
      assert(!hr->is_pinned(), "Unexpected pinned region at index %u", hr->hrm_index());
      assert(hr->in_collection_set(), "bad CS");
  
      if (_hrclaimer->claim_region(hr->hrm_index())) {
        if (hr->evacuation_failed()) {
+         bool during_initial_mark = _g1h->collector_state()->during_initial_mark_pause();
+         bool during_conc_mark = _g1h->collector_state()->mark_in_progress();
+ 
          hr->note_self_forwarding_removal_start(during_initial_mark,
                                                 during_conc_mark);
          _g1h->verifier()->check_bitmaps("Self-Forwarding Ptr Removal", hr);
  
          hr->reset_bot();
  
          size_t live_bytes = remove_self_forward_ptr_by_walking_hr(hr, during_initial_mark);
  
          hr->rem_set()->clean_strong_code_roots(hr);
  
!         hr->note_self_forwarding_removal_end(live_bytes);
        }
      }
      return false;
    }
  };