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

8273430: Suspicious duplicate condition in java.util.regex.Grapheme#isExcludedSpacingMark #5425

Closed
wants to merge 2 commits into from

Conversation

igraves
Copy link
Member

@igraves igraves commented Sep 8, 2021

The duplicate condition in this chain of expressions needs to be shrunk to drop a couple of character that are not excluded spacing marks.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8273430: Suspicious duplicate condition in java.util.regex.Grapheme#isExcludedSpacingMark

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/5425/head:pull/5425
$ git checkout pull/5425

Update a local copy of the PR:
$ git checkout pull/5425
$ git pull https://git.openjdk.java.net/jdk pull/5425/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5425

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/5425.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 8, 2021

👋 Welcome back igraves! 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 added the rfr label Sep 8, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 8, 2021

@igraves The following labels will be automatically applied to this pull request:

  • core-libs
  • i18n

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

@openjdk openjdk bot added core-libs i18n labels Sep 8, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 8, 2021

Webrevs

naotoj
naotoj approved these changes Sep 8, 2021
Copy link
Member

@naotoj naotoj left a comment

The copyright year in Grapheme.java should be 2021, otherwise looks good.

@openjdk
Copy link

@openjdk openjdk bot commented Sep 8, 2021

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

8273430: Suspicious duplicate condition in java.util.regex.Grapheme#isExcludedSpacingMark

Reviewed-by: naoto

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

  • f42b927: 8273609: Fix trivial doc typos in the compiler area
  • e4cd209: 8273611: Remove unused ProfilePrint_lock
  • f690a01: 8273278: Support XSLT on GraalVM Native Image--deterministic bytecode generation in XSLT
  • 5e1df2c: 8273162: AbstractSplittableWithBrineGenerator does not create a random salt
  • d4177a9: 8273351: bad tag in jdk.random module-info.java
  • ec9d1be: 8273194: Document the two possible cases when Lookup::ensureInitialized returns
  • 81d2ace: 8273369: Computing micros between two instants unexpectedly overflows for some cases
  • efe3ed1: 8273358: macOS Monterey does not have the font Times needed by Serif
  • e58c12e: 8273512: Fix the copyright header of x86 macroAssembler files
  • 461a467: 8273456: Do not hold ttyLock around stack walking
  • ... and 58 more: https://git.openjdk.java.net/jdk/compare/270a9d929307dce52e6961e57492c03a633ed044...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 label Sep 8, 2021
@igraves
Copy link
Member Author

@igraves igraves commented Sep 10, 2021

Updating the tests here. Existing ones included code copy/pasted directly from the unit under test. Refactored to a whitebox-style testing that injects accessors into java.util.regex so we don't have to modify code in two places to keep it in sync. Also relaxed two private static methods in java.util.regex.Grapheme to package-private so the injected accessor class can reach them and expose them for the test.

naotoj
naotoj approved these changes Sep 10, 2021
Copy link
Member

@naotoj naotoj left a comment

Looks good. Nice cleanup!

@igraves
Copy link
Member Author

@igraves igraves commented Sep 13, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Sep 13, 2021

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

  • 5095068: 8273675: Remove unused Universe::_verify_in_progress flag
  • fc0f854: 8246797: A convenient method to read OPTIONAL element
  • 6cf5079: 8273513: Make java.io.FilterInputStream specification more precise about overrides
  • b4b1210: 8273616: Fix trivial doc typos in the java.base module
  • 7c26ddb: 8195809: [TESTBUG] jps and jcmd -l support for containers is not tested
  • 4cfa230: 8273259: Character.getName doesn't follow Unicode spec for ideographs
  • f9b2507: 8271834: TestStringDeduplicationAgeThreshold intermittent failures on Shenandoah
  • 261cb44: 8273629: compiler/uncommontrap/TestDeoptOOM.java fails with release VMs
  • b0d0497: 8273584: TypeElement.getSuperclass crashes for a record TypeElement when j.l.Record is not available
  • 4efcd20: 8273478: [macos11] JTabbedPane selected and pressed tab is not legible
  • ... and 73 more: https://git.openjdk.java.net/jdk/compare/270a9d929307dce52e6961e57492c03a633ed044...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Sep 13, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Sep 13, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 13, 2021

@igraves Pushed as commit 3d9dc8f.

💡 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
core-libs i18n integrated
2 participants