Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8319817: Charset constructor should make defensive copy of aliases #2713

Closed
wants to merge 2 commits into from

Conversation

toddjonker
Copy link
Contributor

@toddjonker toddjonker commented Jul 15, 2024

Clean backport.

Additional testing:

  • New regression test fails without the fix, passes with it
  • macosx-aarch64-server-release: make test-tier1
  • linux-x86_64-server-release: JTREG_KEYWORDS="\!headful & \!external-dep & \!printer" make test TEST=all
    • These tests fail repeatedly, but also fail on master:
      • build/AbsPathsInImage.java
      • jdk/internal/platform/docker/TestDockerMemoryMetrics.java

Progress

  • JDK-8319817 needs maintainer approval
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8319817: Charset constructor should make defensive copy of aliases (Bug - P4 - Approved)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/2713/head:pull/2713
$ git checkout pull/2713

Update a local copy of the PR:
$ git checkout pull/2713
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/2713/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2713

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/2713.diff

Webrev

Link to Webrev Comment

@bridgekeeper bridgekeeper bot added the oca Needs verification of OCA signatory status label Jul 15, 2024
@bridgekeeper
Copy link

bridgekeeper bot commented Jul 15, 2024

Hi @toddjonker, welcome to this OpenJDK project and thanks for contributing!

We do not recognize you as Contributor and need to ensure you have signed the Oracle Contributor Agreement (OCA). If you have not signed the OCA, please follow the instructions. Please fill in your GitHub username in the "Username" field of the application. Once you have signed the OCA, please let us know by writing /signed in a comment in this pull request.

If you already are an OpenJDK Author, Committer or Reviewer, please click here to open a new issue so that we can record that fact. Please use "Add GitHub user toddjonker" as summary for the issue.

If you are contributing this work on behalf of your employer and your employer has signed the OCA, please let us know by writing /covered in a comment in this pull request.

@openjdk
Copy link

openjdk bot commented Jul 15, 2024

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

8319817: Charset constructor should make defensive copy of aliases

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

  • a9d755c: 8336342: Fix known X11 library locations in sysroot
  • 7374e7d: 8336343: Add more known sysroot library locations for ALSA
  • fd38e86: 8338286: GHA: Demote x86_32 to hotspot build only
  • ada58fa: 8336854: CAInterop.java#actalisauthenticationrootca conflicted with /manual and /timeout
  • 6f382d1: 8332903: ubsan: opto/output.cpp:1002:18: runtime error: load of value 171, which is not a valid value for type 'bool'
  • e50b815: 8339081: Bump update version for OpenJDK: jdk-17.0.14
  • 99b7468: 8330814: Cleanups for KeepAliveCache tests
  • 03cbfaa: 8315024: Vector API FP reduction tests should not test for exact equality
  • 803c2c2: 8302800: Augment NaN handling tests of FDLIBM methods
  • cd0bb4d: 8310683: Refactor StandardCharset/standard.java to use JUnit
  • ... and 28 more: https://git.openjdk.org/jdk17u-dev/compare/2e9152dc268ee946680f274c9e6006edfb8d0398...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot changed the title Backport d6d7bdc7748c10963c3e58c0287b2472646bf36f 8319817: Charset constructor should make defensive copy of aliases Jul 15, 2024
@openjdk
Copy link

openjdk bot commented Jul 15, 2024

This backport pull request has now been updated with issue from the original commit.

@toddjonker
Copy link
Contributor Author

/covered

@bridgekeeper bridgekeeper bot added the oca-verify Needs verification of OCA signatory status label Jul 15, 2024
@bridgekeeper
Copy link

bridgekeeper bot commented Jul 15, 2024

Thank you! Please allow for a few business days to verify that your employer has signed the OCA. Also, please note that pull requests that are pending an OCA check will not usually be evaluated, so your patience is appreciated!

@toddjonker toddjonker marked this pull request as ready for review July 18, 2024 16:45
@bridgekeeper bridgekeeper bot removed oca Needs verification of OCA signatory status oca-verify Needs verification of OCA signatory status labels Aug 9, 2024
@openjdk
Copy link

openjdk bot commented Aug 9, 2024

⚠️ @toddjonker This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 9, 2024
@mlbridge
Copy link

mlbridge bot commented Aug 9, 2024

Webrevs

@toddjonker
Copy link
Contributor Author

/approval request Clean backport of fix originally authored by @naotoj
Passes all headless tests modulo two known to be flaky in our environment; see PR for details.

@openjdk
Copy link

openjdk bot commented Aug 13, 2024

@toddjonker
8319817: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Aug 13, 2024
@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Aug 29, 2024
@toddjonker
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Aug 30, 2024
@openjdk
Copy link

openjdk bot commented Aug 30, 2024

@toddjonker
Your change (at version 99dbada) is now ready to be sponsored by a Committer.

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Aug 30, 2024

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

  • 42b5e12: 8287003: InputStreamReader::read() can return zero despite writing a char in the buffer
  • 3ddae29: 8331789: ubsan: deoptimization.cpp:403:29: runtime error: load of value 208, which is not a valid value for type 'bool'
  • acfce69: 8332904: ubsan ppc64le: c1_LIRGenerator_ppc.cpp:581:21: runtime error: signed integer overflow: 9223372036854775807 + 1 cannot be represented in type 'long int'
  • a9d755c: 8336342: Fix known X11 library locations in sysroot
  • 7374e7d: 8336343: Add more known sysroot library locations for ALSA
  • fd38e86: 8338286: GHA: Demote x86_32 to hotspot build only
  • ada58fa: 8336854: CAInterop.java#actalisauthenticationrootca conflicted with /manual and /timeout
  • 6f382d1: 8332903: ubsan: opto/output.cpp:1002:18: runtime error: load of value 171, which is not a valid value for type 'bool'
  • e50b815: 8339081: Bump update version for OpenJDK: jdk-17.0.14
  • 99b7468: 8330814: Cleanups for KeepAliveCache tests
  • ... and 31 more: https://git.openjdk.org/jdk17u-dev/compare/2e9152dc268ee946680f274c9e6006edfb8d0398...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 30, 2024

@phohensee @toddjonker Pushed as commit b2c92fd.

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

@toddjonker toddjonker deleted the charset-ctor branch August 30, 2024 21:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants