From ee37af47cd722bbfb7235bab0af44cb6f7b7863c Mon Sep 17 00:00:00 2001 From: Thomas Schatzl Date: Wed, 22 Feb 2023 15:45:12 +0000 Subject: [PATCH] 8302975: Remove redundant mark verification during G1 Full GC Reviewed-by: ayang, kbarrett --- src/hotspot/share/gc/g1/g1FullGCMarker.cpp | 1 - src/hotspot/share/gc/g1/g1FullGCMarker.hpp | 1 - .../share/gc/g1/g1FullGCMarker.inline.hpp | 18 ------------------ 3 files changed, 20 deletions(-) diff --git a/src/hotspot/share/gc/g1/g1FullGCMarker.cpp b/src/hotspot/share/gc/g1/g1FullGCMarker.cpp index a7498a6a7fa..ac71b82d04a 100644 --- a/src/hotspot/share/gc/g1/g1FullGCMarker.cpp +++ b/src/hotspot/share/gc/g1/g1FullGCMarker.cpp @@ -42,7 +42,6 @@ G1FullGCMarker::G1FullGCMarker(G1FullCollector* collector, _objarray_stack(), _preserved_stack(preserved_stack), _mark_closure(worker_id, this, ClassLoaderData::_claim_stw_fullgc_mark, G1CollectedHeap::heap()->ref_processor_stw()), - _verify_closure(G1CollectedHeap::heap(), VerifyOption::G1UseFullMarking), _stack_closure(this), _cld_closure(mark_closure(), ClassLoaderData::_claim_stw_fullgc_mark), _mark_stats_cache(mark_stats, G1RegionMarkStatsCache::RegionMarkStatsCacheSize) { diff --git a/src/hotspot/share/gc/g1/g1FullGCMarker.hpp b/src/hotspot/share/gc/g1/g1FullGCMarker.hpp index 4f35d656e1a..cfe9d125e20 100644 --- a/src/hotspot/share/gc/g1/g1FullGCMarker.hpp +++ b/src/hotspot/share/gc/g1/g1FullGCMarker.hpp @@ -63,7 +63,6 @@ class G1FullGCMarker : public CHeapObj { // Marking closures G1MarkAndPushClosure _mark_closure; - G1VerifyLiveClosure _verify_closure; G1FollowStackClosure _stack_closure; CLDToOopClosure _cld_closure; StringDedup::Requests _string_dedup_requests; diff --git a/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp b/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp index b9116902aed..43c2d9d2f1c 100644 --- a/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp +++ b/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp @@ -123,14 +123,6 @@ void G1FullGCMarker::follow_array_chunk(objArrayOop array, int index) { } array->oop_iterate_range(mark_closure(), beg_index, end_index); - - if (VerifyDuringGC) { - _verify_closure.set_containing_obj(array); - array->oop_iterate_range(&_verify_closure, beg_index, end_index); - if (_verify_closure.has_failures()) { - fatal("there should not have been any failures"); - } - } } inline void G1FullGCMarker::follow_object(oop obj) { @@ -141,16 +133,6 @@ inline void G1FullGCMarker::follow_object(oop obj) { follow_array((objArrayOop)obj); } else { obj->oop_iterate(mark_closure()); - if (VerifyDuringGC) { - if (obj->is_instanceRef()) { - return; - } - _verify_closure.set_containing_obj(obj); - obj->oop_iterate(&_verify_closure); - if (_verify_closure.has_failures()) { - fatal("there should not have been any failures"); - } - } } }