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

*** 1,7 ****
  /*
!  * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 282,293 ****
      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,
--- 282,293 ----
      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()->collector_state()->gcs_are_young();
!     const bool during_im = g1_policy()->collector_state()->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,