[premain] need help merging g1BarrierSetC2.cpp

[ioi.lam at oracle.com]

In the premain branch, we have made some changes in g1BarrierSetC2.cpp

     commit cc111760a0dd123935e039feb19eaac742f865b2
     Author: Vladimir Kozlov <vladimir.kozlov at oracle.com>
     Date:   Mon Aug 26 14:21:28 2024

     Cleanup AOT runtime constants code

     commit c319a3ee2be0236feab88c9be66d71e6e93b53fc
     Author: Andrew Dinn <adinn at redhat.com>
     Date:   Wed Aug 21 07:48:22 2024

     AOT G1 barrier loads region grain and card shifts via runtime 
constants data area

Recently, the following changes in g1BarrierSetC2.cpp have been pushed 
to mainline that caused conflicts with the leyden changes.

     commit 81ebbb2463df8b014bb209dc4028668fc78e8327
     Author: Roberto Castañeda Lozano <rcastanedalo at openjdk.org>
     Date:   Mon Oct 7 01:28:18 2024

     8341525: G1: use bit clearing to remove tightly-coupled 
initialization store pre-barriers

     commit 0b467e902d591ae9feeec1669918d1588987cd1c
     Author: Roberto Castañeda Lozano <rcastanedalo at openjdk.org>
     Date:   Thu Oct 3 01:36:33 2024

     8334060: Implementation of Late Barrier Expansion for G1


When I tried merging with mainline, I couldn't merge these changes, so I 
ended up merging to this one (just an hour prior to 0b467e9), and pushed 
the result to premain.

     commit c6e7e551928c04b74775b5d4c03eb31232aeb2c9 (master)
     Author: Aleksey Shipilev <shade at openjdk.org>
     Date:   Thu Oct 3 00:25:42 2024

     8341091: CDS: Segmented roots array misses roots

Andrew Dinn or Vladimir Kozlov, could you help merging with mainline?

Thanks

- Ioi