--- old/src/hotspot/share/gc/g1/g1EvacFailure.cpp	2019-03-13 14:03:03.858104778 +0100
+++ new/src/hotspot/share/gc/g1/g1EvacFailure.cpp	2019-03-13 14:03:03.647099047 +0100
@@ -228,6 +228,8 @@
 
     if (_hrclaimer->claim_region(hr->hrm_index())) {
       if (hr->evacuation_failed()) {
+        hr->clear_index_in_opt_cset();
+
         bool during_initial_mark = _g1h->collector_state()->in_initial_mark_gc();
         bool during_conc_mark = _g1h->collector_state()->mark_or_rebuild_in_progress();