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

[Schmidt, Lutz]

Thanks for reviewing, Paul!
Best,
Lutz

On 14.04.21, 19:01, "Hohensee, Paul" <hohensee at amazon.com> wrote:

    Lgtm.

    Thanks,
    Paul

    -----Original Message-----
    From: jdk-updates-dev <jdk-updates-dev-retn at openjdk.java.net> on behalf of "Schmidt, Lutz" <lutz.schmidt at sap.com>
    Date: Tuesday, April 13, 2021 at 12:51 AM
    To: "jdk-updates-dev at openjdk.java.net" <jdk-updates-dev at openjdk.java.net>
    Cc: build-dev <build-dev at openjdk.java.net>
    Subject: [11u] RFR(M): 8233787 backport: Break cycle in vm_version* includes

    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.