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

*** 1,7 ****
  /*
!  * Copyright (c) 2012, 2013, 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) 2012, 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.
*** 189,199 ****
        _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");
  
--- 189,199 ----
        _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()->collector_state()->during_initial_mark_pause();
      bool during_conc_mark = _g1h->mark_in_progress();
  
      assert(!hr->is_humongous(), "sanity");
      assert(hr->in_collection_set(), "bad CS");