Skip to content
This repository has been archived by the owner on Sep 19, 2023. It is now read-only.
/ jdk19 Public archive

8288769: Revert unintentional change to deflate.c #159

Closed
wants to merge 1 commit into from

Conversation

LanceAndersen
Copy link

@LanceAndersen LanceAndersen commented Aug 3, 2022

Hi,

Please review this patch to deflate.c which reverts an unintentional change that was part of JDK-8284371, which reverted the reworking of (7) deflate.c undo (6), replaced withe the official zlib repo fix see#305/#f969409

Mach5 tiers1-3 have been run without failure


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-8288769: Revert unintentional change to deflate.c

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 159

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk19/pull/159.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 3, 2022

👋 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
Copy link

openjdk bot commented Aug 3, 2022

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

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Aug 3, 2022
@LanceAndersen LanceAndersen marked this pull request as ready for review August 3, 2022 14:34
@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 3, 2022
@mlbridge
Copy link

mlbridge bot commented Aug 3, 2022

Webrevs

@openjdk
Copy link

openjdk bot commented Aug 3, 2022

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

8288769: Revert unintentional change to deflate.c

Reviewed-by: iris, bpb, alanb

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

  • e265b2a: 8290867: Race freeing remembered set segments
  • 54c093a: 8291524: jdk/jfr/event/runtime/TestClassLoaderStatsEvent.java Value not equal to 2, field='hiddenClassCount', value='0'
  • 1d16c91: 8291512: Snippetize modules API examples
  • 36c00fd: 8291006: java/foreign/TestUnsupportedPlatform fails after JDK-8290455
  • 8c9d5ad: 8290455: jck test api/java_lang/foreign/VaList/Empty.html fails on some platforms

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 openjdk bot added the ready Pull request is ready to be integrated label Aug 3, 2022
Copy link
Member

@bplb bplb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

@AlanBateman
Copy link

The revert looks okay but it is concerning that the original change was not caught by a test. Are there tests that could have caught this?

@LanceAndersen
Copy link
Author

The revert looks okay but it is concerning that the original change was not caught by a test. Are there tests that could have caught this?

Not that I am aware of.

per open/src/java.base/share/native/libzip/zlib/patches/ChangeLog_java

JDK-8191918 modifies the changes made in JDK-8184306 to use the official zlib repo fix see#305/#f969409

@LanceAndersen
Copy link
Author

/integrate

@openjdk
Copy link

openjdk bot commented Aug 10, 2022

Going to push as commit 4c6d22a.
Since your change was applied there have been 10 commits pushed to the master branch:

  • 5fce02e: 8291496: Allocating card table before heap causes underflow asserts in CardTable::addr_for()
  • 0def531: 8290889: JDK 19 RDP2 L10n resource files update - msgdrop 10
  • 5963300: 8290562: ThreadMXBean.getThread{Cpu,User}Time fails with -XX:-VMContinuations
  • 4b3dfe1: 8283276: java/io/ObjectStreamClass/ObjectStreamClassCaching.java fails with various GCs
  • 43bb399: 8291757: Remove EA from JDK 19 version string starting with Initial RC promotion B35 on August 11, 2022
  • e265b2a: 8290867: Race freeing remembered set segments
  • 54c093a: 8291524: jdk/jfr/event/runtime/TestClassLoaderStatsEvent.java Value not equal to 2, field='hiddenClassCount', value='0'
  • 1d16c91: 8291512: Snippetize modules API examples
  • 36c00fd: 8291006: java/foreign/TestUnsupportedPlatform fails after JDK-8290455
  • 8c9d5ad: 8290455: jck test api/java_lang/foreign/VaList/Empty.html fails on some platforms

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Aug 10, 2022
@openjdk openjdk bot closed this Aug 10, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Aug 10, 2022
@openjdk
Copy link

openjdk bot commented Aug 10, 2022

@LanceAndersen Pushed as commit 4c6d22a.

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

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
4 participants