*** old/src/share/vm/gc/g1/g1EvacFailure.cpp	Tue Mar  8 15:19:38 2016
--- new/src/share/vm/gc/g1/g1EvacFailure.cpp	Tue Mar  8 15:19:37 2016

*** 211,221 ****
--- 211,221 ----
      rspc.zap_remainder();
  
      return rspc.marked_bytes();
    }
  
!   bool doHeapRegion(HeapRegion *hr) {
!   void 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_pinned(), "Unexpected pinned region at index %u", hr->hrm_index());
      assert(hr->in_collection_set(), "bad CS");

*** 244,254 ****
--- 244,253 ----
          hr->note_self_forwarding_removal_end(during_initial_mark,
                                               during_conc_mark,
                                               live_bytes);
        }
      }
      return false;
    }
  };
  
  G1ParRemoveSelfForwardPtrsTask::G1ParRemoveSelfForwardPtrsTask() :
    AbstractGangTask("G1 Remove Self-forwarding Pointers"),