8347334: JimageDiffGenerator code clean-ups

[jerboaa]

During code review of JDK-8346239 a few comments were made after the PR integrated. This follow-up patch cleans this up and adds a unit test for the JimageDiffGenerator class.

Testing:

• GHA
• tools/jlink tests (including the new one).

Thoughts?

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• Change must not contain extraneous whitespace
• Commit message must refer to an issue

Issue

• JDK-8347334: JimageDiffGenerator code clean-ups (Bug - P4)

Reviewers

• Henry Jen (@slowhog - Committer)
• Matthias Baesken (@MBaesken - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/23014/head:pull/23014
$ git checkout pull/23014

Update a local copy of the PR:
$ git checkout pull/23014
$ git pull https://git.openjdk.org/jdk.git pull/23014/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23014

View PR using the GUI difftool:
$ git pr show -t 23014

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/23014.diff

Using Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back sgehwolf! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

@jerboaa This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8347334: JimageDiffGenerator code clean-ups

Reviewed-by: henryjen, mbaesken

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 88 new commits pushed to the master branch:

• 7df21a8: 8347597: HttpClient: improve exception reporting when closing connection
• b0e2be6: 8347729: Replace SIZE_FORMAT in parallel and serial gc
• d4e5ec2: 8346610: Make all imports consistent in the FFM API
• c36200b: 8347721: Replace SIZE_FORMAT in compiler directories
• af3f5d8: 8347039: ThreadPerTaskExecutor terminates if cancelled tasks still running
• 91197b3: 8347531: The signal tests are failing after JDK-8345782 due to an unrelated warning
• 4f3dc9d: 8347352: RISC-V: Cleanup bitwise AND assembler routines
• afc4529: 8346834: Tests failing with -XX:+UseNUMA due to "NUMA support disabled" warning
• a3be97e: 8347761: Test tools/jimage/JImageExtractTest.java fails after JDK-8303884
• 28e01e6: 8347762: ClassFile attribute specification refers to non-SE modules
• ... and 78 more: https://git.openjdk.org/jdk/compare/1f457977f062e4ed219c6fa0fe26cb42acaf4bf2...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

[openjdk]

@jerboaa The following label will be automatically applied to this pull request:

• core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

[mlbridge]

Webrevs

• 03: Full - Incremental (8b602b42)
• 02: Full - Incremental (c9cbb9a0)
• 01: Full - Incremental (42baf977)
• 00: Full (5b98866d)

[archiecobbs]

(Getting into marginal returns on comments here, so my apologies for nitpicking)

The loop could be simplified even further...

while (true) {
    int bytesRead1 = is1.readNBytes(buf1, 0, buf1.length);
    int bytesRead2 = is2.readNBytes(buf2, 0, buf2.length);
    if (!Arrays.equals(buf1, 0, bytesRead1, buf2, 0, bytesRead2))
        return false; 
    if (bytesRead1 == 0)
        return true;
}

[jerboaa]

The loop could be simplified even further...

Done it the latest update.

[jerboaa]

@archiecobbs @AlanBateman Any thoughts? Is this good to go? Thanks!

[archiecobbs]

Hi @jerboaa, LGMT - my comments are addressed (thanks :) I'm not an official reviewer though.

[jerboaa]

Still looking for a Reviewer to ack this.

[slowhog]

I am not a JDK reviewer, so you will need someone else.

[jerboaa]

@MBaesken Would you be OK to ack this as well, since you looked at https://bugs.openjdk.org/browse/JDK-8346239? Thanks in advance.

[jerboaa]

Thanks!

/integrate

[openjdk]

Going to push as commit 63cedaf.
Since your change was applied there have been 90 commits pushed to the master branch:

• 254e840: 8340416: Remove ArchiveBuilder::estimate_archive_size()
• 8193ba3: 8347562: javac crash due to type vars in permits clause
• 7df21a8: 8347597: HttpClient: improve exception reporting when closing connection
• b0e2be6: 8347729: Replace SIZE_FORMAT in parallel and serial gc
• d4e5ec2: 8346610: Make all imports consistent in the FFM API
• c36200b: 8347721: Replace SIZE_FORMAT in compiler directories
• af3f5d8: 8347039: ThreadPerTaskExecutor terminates if cancelled tasks still running
• 91197b3: 8347531: The signal tests are failing after JDK-8345782 due to an unrelated warning
• 4f3dc9d: 8347352: RISC-V: Cleanup bitwise AND assembler routines
• afc4529: 8346834: Tests failing with -XX:+UseNUMA due to "NUMA support disabled" warning
• ... and 80 more: https://git.openjdk.org/jdk/compare/1f457977f062e4ed219c6fa0fe26cb42acaf4bf2...master

Your commit was automatically rebased without conflicts.

[openjdk]

@jerboaa Pushed as commit 63cedaf.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.