< prev index next >

src/hotspot/share/gc/g1/g1EvacFailure.cpp

Print this page

        

*** 28,37 **** --- 28,38 ---- #include "gc/g1/g1ConcurrentMark.inline.hpp" #include "gc/g1/g1DirtyCardQueue.hpp" #include "gc/g1/g1EvacFailure.hpp" #include "gc/g1/g1HeapVerifier.hpp" #include "gc/g1/g1OopClosures.inline.hpp" + #include "gc/g1/g1_globals.hpp" #include "gc/g1/heapRegion.hpp" #include "gc/g1/heapRegionRemSet.hpp" #include "gc/shared/preservedMarks.inline.hpp" #include "oops/access.inline.hpp" #include "oops/compressedOops.inline.hpp"
*** 225,236 **** assert(!hr->is_pinned(), "Unexpected pinned region at index %u", hr->hrm_index()); assert(hr->in_collection_set(), "bad CS"); 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(); hr->note_self_forwarding_removal_start(during_initial_mark, during_conc_mark); --- 226,235 ----
*** 256,262 **** _hrclaimer(_g1h->workers()->active_workers()) { } void G1ParRemoveSelfForwardPtrsTask::work(uint worker_id) { RemoveSelfForwardPtrHRClosure rsfp_cl(worker_id, &_hrclaimer); ! _g1h->collection_set_iterate_increment_from(&rsfp_cl, worker_id); } --- 255,261 ---- _hrclaimer(_g1h->workers()->active_workers()) { } void G1ParRemoveSelfForwardPtrsTask::work(uint worker_id) { RemoveSelfForwardPtrHRClosure rsfp_cl(worker_id, &_hrclaimer); ! _g1h->collection_set_iterate_from(&rsfp_cl, worker_id); }
< prev index next >