RFR: 8234534: Simplify CardTable code after CMS removal

Kim Barrett kbarrett at openjdk.java.net
Thu Feb 4 10:31:41 UTC 2021


On Tue, 2 Feb 2021 15:13:38 GMT, Thomas Schatzl <tschatzl at openjdk.org> wrote:

> Hi,
> 
>   can I have reviews for this cleanup that removes CMS specific code from `CardTable/CardTableRS`?
> 
> Note that there is still this "conc_scan" parameter passed to the card table that affects barrier code generation, for some reason also G1 barrier code generation although it should not as `G1CardTable::scanned_concurrently()` only used for the "normal" card table. Initial attempts showed that removing this is not straightforward, causing crashes and so I left it out for [JDK-8250941](https://bugs.openjdk.java.net/browse/JDK-8260941) so that this change is solely about removing unused code.
> 
> Testing: tier1-4, some tier1-5 runs earlier (before some removal of hunks for files only containing copyright updates or newline changes)

Looks good to me, with the one minor nit I commented on and Albert's suggestions.

src/hotspot/share/gc/shared/cardTableRS.cpp line 43:

> 41: inline bool ClearNoncleanCardWrapper::clear_card(CardValue* entry) {
> 42:   CardValue entry_val = *entry;
> 43:   assert(entry_val == CardTableRS::dirty_card_val(),

Consider eliminating `entry_val` - just use `*entry` in the assert.

-------------

Marked as reviewed by kbarrett (Reviewer).

PR: https://git.openjdk.java.net/jdk/pull/2354



More information about the hotspot-gc-dev mailing list