src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp

*** 27,36 ****
--- 27,37 ----
  
  #include "gc_implementation/g1/concurrentMark.hpp"
  #include "gc_implementation/g1/g1CollectedHeap.hpp"
  #include "gc_implementation/g1/g1AllocRegion.inline.hpp"
  #include "gc_implementation/g1/g1CollectorPolicy.hpp"
+ #include "gc_implementation/g1/g1CollectorState.hpp"
  #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
  #include "gc_implementation/g1/heapRegionManager.inline.hpp"
  #include "gc_implementation/g1/heapRegionSet.inline.hpp"
  #include "runtime/orderAccess.inline.hpp"
  #include "utilities/taskqueue.hpp"
*** 286,298 ****
      const size_t elapsed_gcs = gc_num - _evacuation_failure_alot_gc_number;
  
      _evacuation_failure_alot_for_current_gc = (elapsed_gcs >= G1EvacuationFailureALotInterval);
  
      // Now check if G1EvacuationFailureALot is enabled for the current GC type.
!     const bool gcs_are_young = g1_policy()->gcs_are_young();
!     const bool during_im = g1_policy()->during_initial_mark_pause();
!     const bool during_marking = mark_in_progress();
  
      _evacuation_failure_alot_for_current_gc &=
        evacuation_failure_alot_for_gc_type(gcs_are_young,
                                            during_im,
                                            during_marking);
--- 287,299 ----
      const size_t elapsed_gcs = gc_num - _evacuation_failure_alot_gc_number;
  
      _evacuation_failure_alot_for_current_gc = (elapsed_gcs >= G1EvacuationFailureALotInterval);
  
      // Now check if G1EvacuationFailureALot is enabled for the current GC type.
!     const bool gcs_are_young = collector_state()->gcs_are_young();
!     const bool during_im = collector_state()->during_initial_mark_pause();
!     const bool during_marking = collector_state()->mark_in_progress();
  
      _evacuation_failure_alot_for_current_gc &=
        evacuation_failure_alot_for_gc_type(gcs_are_young,
                                            during_im,
                                            during_marking);