8276540: Howl Full CardSet container iteration marks too many cards

Thomas Schatzl · Thomas Schatzl · commit ff6863c98dbd · 2021-11-08T12:59:00.000Z
Reviewed-by: ayang, sjohanss
diff --git a/src/hotspot/share/gc/g1/g1CardSetContainers.inline.hpp b/src/hotspot/share/gc/g1/g1CardSetContainers.inline.hpp
@@ -330,7 +330,7 @@ inline void G1CardSetHowl::iterate_cardset(CardSetPtr const card_set, uint index
       if (found.start_iterate(G1GCPhaseTimes::MergeRSHowlFull)) {
         assert(card_set == G1CardSet::FullCardSet, "Must be");
         uint offset = index << config->log2_num_cards_in_howl_bitmap();
-        for (uint i = 0; i < config->max_cards_in_region(); i++) {
+        for (uint i = 0; i < config->num_cards_in_howl_bitmap(); i++) {
           found((offset | (uint)i));
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ inline void G1CardSetHowl::iterate_cardset(CardSetPtr const card_set, uint index`
`330`	`330`	`if (found.start_iterate(G1GCPhaseTimes::MergeRSHowlFull)) {`
`331`	`331`	`assert(card_set == G1CardSet::FullCardSet, "Must be");`
`332`	`332`	`uint offset = index << config->log2_num_cards_in_howl_bitmap();`
`333`		`- for (uint i = 0; i < config->max_cards_in_region(); i++) {`
	`333`	`+ for (uint i = 0; i < config->num_cards_in_howl_bitmap(); i++) {`
`334`	`334`	`found((offset \| (uint)i));`
`335`	`335`	`}`
`336`	`336`	`}`