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

8301119: Support for GB18030-2022 #1391

Closed
wants to merge 1 commit into from

Conversation

gnu-andrew
Copy link
Member

@gnu-andrew gnu-andrew commented May 23, 2023

This is the companion implementation change for the recent specification changes which allowed for the additional characters required to support GB18030-2022.

The backport from trunk is clean as regards code. The only manual adjustments necessary were applying the copyright header changes, as trunk has JDK-8260265: "UTF-8 by Default", a JEP added in OpenJDK 18.

Tests in jdk/java/nio/charset and jdk/sun/nio/cs all passed after patching.


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
  • Change requires CSR request JDK-8301559 to be approved

Issues

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1391

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 23, 2023

👋 Welcome back andrew! 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 openjdk bot changed the title Backport a253b4602147633a3d2e83775d1feef4f12a5272 8301119: Support for GB18030-2022 May 23, 2023
@openjdk
Copy link

openjdk bot commented May 23, 2023

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels May 23, 2023
@mlbridge
Copy link

mlbridge bot commented May 23, 2023

Webrevs

Copy link
Contributor

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

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

LGTM.

@openjdk
Copy link

openjdk bot commented May 24, 2023

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

8301119: Support for GB18030-2022

Reviewed-by: sgehwolf

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

  • 6033871: 8306640: Open source several AWT TextArea related tests
  • 05b2ff4: 8308554: [17u] Fix commit of 8286191. vm.musl was not removed from ExternalEditorTest
  • 9c0afc5: 8306752: Open source several container and component AWT tests
  • 4caa421: 8306755: Open source few Swing JComponent and AbstractButton tests
  • b5d3772: 8306683: Open source several clipboard and color AWT tests
  • 09e6880: 8306652: Open source AWT MenuItem related tests
  • 18ec008: 8306409: Open source AWT KeyBoardFocusManger, LightWeightComponent related tests
  • 536e133: 8306850: Open source AWT Modal related tests
  • 7277a75: 8306072: Open source several AWT MouseInfo related tests
  • 40526a7: 8307080: Open source some more JComboBox jtreg tests
  • ... and 6 more: https://git.openjdk.org/jdk17u-dev/compare/2dc22d6a5c3f6cb6a1a98351278cb51f65834b86...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 openjdk bot added the ready Pull request is ready to be integrated label May 24, 2023
@gnu-andrew
Copy link
Member Author

Thanks. Flagged with jdk17u-fix-request.

@gnu-andrew
Copy link
Member Author

I see jdk17u-fix-yes
/integrate

@openjdk
Copy link

openjdk bot commented May 26, 2023

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

  • 3d32a20: 8286331: jni_GetStringUTFChars() uses wrong heap allocator
  • 6287df0: 8286346: 3-parameter version of AllocateHeap should not ignore AllocFailType
  • 6803da9: 8301661: Enhance os::pd_print_cpu_info on macOS and Windows
  • 0d2cc35: 8292713: Unsafe.allocateInstance should be intrinsified without UseUnalignedAccesses
  • 5bf1b9a: 8283520: JFR: Memory leak in dcmd_arena
  • c581886: 8307128: Open source some drag and drop tests 4
  • 14779b1: 8294717: (bf) DirectByteBuffer constructor will leak if allocating Deallocator or Cleaner fails with OOME
  • 57d0a7f: 8300939: sun/security/provider/certpath/OCSP/OCSPNoContentLength.java fails due to network errors
  • 436d96f: 8275287: Relax memory ordering constraints on updating instance class and array class counters
  • 50aabaa: 8307347: serviceability/sa/ClhsdbDumpclass.java could leave files owned by root on macOS
  • ... and 19 more: https://git.openjdk.org/jdk17u-dev/compare/2dc22d6a5c3f6cb6a1a98351278cb51f65834b86...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 26, 2023

@gnu-andrew Pushed as commit 6919ff2.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
3 participants