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

*** 24,33 ****
--- 24,34 ----
  
  #include "precompiled.hpp"
  #include "gc_implementation/g1/concurrentMark.inline.hpp"
  #include "gc_implementation/g1/dirtyCardQueue.hpp"
  #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
+ #include "gc_implementation/g1/g1CollectorState.hpp"
  #include "gc_implementation/g1/g1EvacFailure.hpp"
  #include "gc_implementation/g1/g1_globals.hpp"
  #include "gc_implementation/g1/g1OopClosures.inline.hpp"
  #include "gc_implementation/g1/heapRegion.hpp"
  #include "gc_implementation/g1/heapRegionRemSet.hpp"
*** 184,195 ****
        _g1h(g1h), _dcq(&g1h->dirty_card_queue_set()), _update_rset_cl(g1h, &_dcq),
        _worker_id(worker_id), _cm(_g1h->concurrent_mark()), _hrclaimer(hrclaimer) {
    }
  
    bool doHeapRegion(HeapRegion *hr) {
!     bool during_initial_mark = _g1h->g1_policy()->during_initial_mark_pause();
!     bool during_conc_mark = _g1h->mark_in_progress();
  
      assert(!hr->is_humongous(), "sanity");
      assert(hr->in_collection_set(), "bad CS");
  
      if (_hrclaimer->claim_region(hr->hrm_index())) {
--- 185,196 ----
        _g1h(g1h), _dcq(&g1h->dirty_card_queue_set()), _update_rset_cl(g1h, &_dcq),
        _worker_id(worker_id), _cm(_g1h->concurrent_mark()), _hrclaimer(hrclaimer) {
    }
  
    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_humongous(), "sanity");
      assert(hr->in_collection_set(), "bad CS");
  
      if (_hrclaimer->claim_region(hr->hrm_index())) {