src/share/vm/gc/g1/g1CollectedHeap.cpp

*** 3472,3482 ****
  
  void G1CollectedHeap::restore_after_evac_failure() {
    double remove_self_forwards_start = os::elapsedTime();
  
    remove_self_forwarding_pointers();
!   _preserved_marks_set.restore(workers());
  
    g1_policy()->phase_times()->record_evac_fail_remove_self_forwards((os::elapsedTime() - remove_self_forwards_start) * 1000.0);
  }
  
  void G1CollectedHeap::preserve_mark_during_evac_failure(uint worker_id, oop obj, markOop m) {
--- 3472,3483 ----
  
  void G1CollectedHeap::restore_after_evac_failure() {
    double remove_self_forwards_start = os::elapsedTime();
  
    remove_self_forwarding_pointers();
!   SharedPreservedMarksTaskExecutor task_executor(workers());
!   _preserved_marks_set.restore(&task_executor);
  
    g1_policy()->phase_times()->record_evac_fail_remove_self_forwards((os::elapsedTime() - remove_self_forwards_start) * 1000.0);
  }
  
  void G1CollectedHeap::preserve_mark_during_evac_failure(uint worker_id, oop obj, markOop m) {