[11u] RFR(M): 8233787 backport: Break cycle in vm_version* includes

Vladimir Kempik vkempik at azul.com
Wed Apr 14 16:24:36 UTC 2021

this backport is pretty much needed in jdk11u-dev as it’s one of prerequests (soft one tho) for jep-391 to apply more cleanly.
I was doing this backport multiple times (including to zulu11) and know what a PITA it is.
Looking forward for integration of this into 11u.
Regards, Vladimir.

> 13 апр. 2021 г., в 10:51, Schmidt, Lutz <lutz.schmidt at sap.com> написал(а):
> Dear Community,
> I would appreciate receiving reviews for this downport change. It consists of many modified files. In most cases, it’s only #include statement changes, caused by factoring out abstract_vm_version.{c|h}pp from vm_version.{c|h}pp. The change did not apply cleanly, for the most part because of this split. The other merge conflicts were trivial (include rearrangement and copyright headers).
> Original bug:          https://bugs.openjdk.java.net/browse/JDK-8233787
> Downport webrev:       https://cr.openjdk.java.net/~lucy/webrevs/8233787.11u.01/
> Merge conflicts:       https://cr.openjdk.java.net/~lucy/webrevs/8233787-jdk11u.conflicts
> Conflict resolve diff: https://cr.openjdk.java.net/~lucy/webrevs/8233787-jdk11u.conflictresolve
> Tests:
> SAP's internal build and test farm (all OpenJDK platforms (no 32-bit), and more). Tests include JCK, jtreg (hotspot and jdk), and SAP-private tests. No issues found.
> Your effort is very much appreciated!
> Thanks,
> Lutz
> P.S.: build-dev on CC: because a small build change is included.

More information about the jdk-updates-dev mailing list