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

*** 1,7 ****
  /*
!  * Copyright (c) 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) 2014, 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.
*** 63,73 ****
      // The retained region was added to the old region set when it was
      // retired. We have to remove it now, since we don't allow regions
      // we allocate to in the region sets. We'll re-add it later, when
      // it's retired again.
      _g1h->_old_set.remove(retained_region);
!     bool during_im = _g1h->g1_policy()->during_initial_mark_pause();
      retained_region->note_start_of_copying(during_im);
      old->set(retained_region);
      _g1h->_hr_printer.reuse(retained_region);
      evacuation_info.set_alloc_regions_used_before(retained_region->used());
    }
--- 63,73 ----
      // The retained region was added to the old region set when it was
      // retired. We have to remove it now, since we don't allow regions
      // we allocate to in the region sets. We'll re-add it later, when
      // it's retired again.
      _g1h->_old_set.remove(retained_region);
!     bool during_im = _g1h->g1_policy()->collector_state()->during_initial_mark_pause();
      retained_region->note_start_of_copying(during_im);
      old->set(retained_region);
      _g1h->_hr_printer.reuse(retained_region);
      evacuation_info.set_alloc_regions_used_before(retained_region->used());
    }