8295530: Update Zlib Data Compression Library to Version 1.2.13

[LanceAndersen]

Hi all,

Please review this PR which will update the Zlib Data Compression Library from 1.2.11 to 1.2.13.

• I have run all of the Mach5 tiers which did not show any issues related to the upgrade.
• The JCK zip/jar tests also continue to pass.
• Jai ran his macOS aarch64 test(for JDK-8282954) with the zlib 1.2.13 port and has not seen the failure as seen with the MacOS aarch64 native zlib port

Best,
Lance

---

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-8295530: Update Zlib Data Compression Library to Version 1.2.13

Reviewers

• Alan Bateman (@AlanBateman - Reviewer)
• Jaikiran Pai (@jaikiran - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10773

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

Using diff file

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

[bridgekeeper]

👋 Welcome back lancea! 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]

@LanceAndersen 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

• 00: Full (26e01075)

[AlanBateman]

Can you confirm that this is exactly the 1.2.13 code, no patches/changes, right?

[LanceAndersen]

Can you confirm that this is exactly the 1.2.13 code, no patches/changes, right?

That is correct, there are no patches on top of the 1.2.13

[AlanBateman]

I didn't go through every file, instead I just sampled and compared to what is the zlib project. I think it's good to get this upgrade done.

[openjdk]

@LanceAndersen 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:

8295530: Update Zlib Data Compression Library to Version 1.2.13

Reviewed-by: alanb, jpai

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 98 new commits pushed to the master branch:

• c5e0464: 8291456: com/sun/jdi/ClassUnloadEventTest.java failed with: Wrong number of class unload events: expected 10 got 4
• 8d4c077: 8295302: Do not use ArrayList when LambdaForm has a single ClassData
• 017e798: 8293939: Move continuation_enter_setup and friends
• f872467: 8255746: Make PrintCompilation available on a per method level
• 388a56e: 8294467: Fix sequence-point warnings in Hotspot
• ceb5b08: 8294468: Fix char-subscripts warnings in Hotspot
• 7b1c676: 8295662: jdk/incubator/vector tests fail "assert(VM_Version::supports_avx512vlbw()) failed"
• 5eaf568: 8295668: validate-source failure after JDK-8290011
• e238920: 8295372: CompactNumberFormat handling of number one with decimal part
• a5f6e31: 8295456: (ch) sun.nio.ch.Util::checkBufferPositionAligned gives misleading/incorrect error
• ... and 88 more: https://git.openjdk.org/jdk/compare/f5f8df11ce146f8b33963eea4de6ccf9d2373ff3...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.

[jaikiran]

Hello Lance, it appears that we had done this change to this file in the JDK as part of https://bugs.openjdk.org/browse/JDK-8283525. As Sean notes in that issue, the http link is back to working but https was still prefered during that change. Should we stick with https?

[LanceAndersen]

Hi Jai,

Given this is how it is in the README in the upstream repository and it is accessible, I would prefer not to change it and when/if we do, we should have the change made upstream

[jaikiran]

Thank you Lance, that sounds fine to me.

[jaikiran]

I checked out Mark Adler's upstream 1.2.13 tag https://github.com/madler/zlib/tree/v1.2.13 locally and then ran diff src/java.base/share/native/libzip/zlib <root-of-1.2.13-of-madler-repo>. The diff shows that for the (common) files that we have in this PR, there's no difference other than additional copyright headers.

Additionally against Mark's upstream git repo, I ran:

git diff --name-only --diff-filter=A v1.2.11 v1.2.13 

to find any newly added files (that might be relevant to us) between these 2 versions. The output is:

.github/workflows/cmake.yml
.github/workflows/configure.yml
.github/workflows/fuzz.yml
LICENSE
doc/crc-doc.1.0.pdf
examples/gznorm.c
examples/zran.h

None of which is relevant to JDK.

I also ran:

git diff --name-only --diff-filter=D v1.2.11 v1.2.13

to find any deleted files between these 2 versions and the output is:

contrib/amd64/amd64-match.S
contrib/asm686/README.686
contrib/asm686/match.S
contrib/inflate86/inffas86.c
contrib/inflate86/inffast.S
contrib/masmx64/bld_ml64.bat
contrib/masmx64/gvmat64.asm
contrib/masmx64/inffas8664.c
contrib/masmx64/inffasx64.asm
contrib/masmx64/readme.txt
contrib/masmx86/bld_ml32.bat
contrib/masmx86/inffas32.asm
contrib/masmx86/match686.asm
contrib/masmx86/readme.txt

none of which appear relevant to us.

Finally, I ran:

git diff --name-only --diff-filter=R v1.2.11 v1.2.13 

to find any renamed files. This returns no output (since nothing was renamed).

So overall, the change in this PR looks good to me and appears to be same as what's there in 1.2.13 of upstream.

[LanceAndersen]

/integrate

[openjdk]

Going to push as commit 0c13d66.
Since your change was applied there have been 124 commits pushed to the master branch:

• 15bebf9: 8295666: Linux x86 build fails after 8292591
• 5064718: 8294460: CodeSection::alignment checks for CodeBuffer::SECT_STUBS incorrectly
• 8b010e0: 8030616: sun/management/jmxremote/bootstrap/RmiBootstrapTest fails intermittently with cannot find a free port
• b35922b: 8295714: GHA ::set-output is deprecated and will be removed
• dfd2d83: 8295657: SA: Allow larger object alignments
• a345df2: 8280131: jcmd reports "Module jdk.jfr not found." when "jdk.management.jfr" is missing
• ef62b61: 8295703: RISC-V: Remove implicit noreg temp register arguments in MacroAssembler
• 6240431: 8295697: Resolve conflicts between serviceability/jvmti and nsk/jvmti shared code
• 1164258: 8295124: Atomic::add to pointer type may return wrong value
• d3eba85: 8295414: [Aarch64] C2: assert(false) failed: bad AD file
• ... and 114 more: https://git.openjdk.org/jdk/compare/f5f8df11ce146f8b33963eea4de6ccf9d2373ff3...master

Your commit was automatically rebased without conflicts.

[openjdk]

@LanceAndersen Pushed as commit 0c13d66.

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