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

8314423: Multiple patterns without unnamed variables #15310

Closed
wants to merge 2 commits into from

Conversation

biboudis
Copy link
Member

@biboudis biboudis commented Aug 16, 2023

This PR addresses both JDK-8314423 and JDK-8314216, since both are relevant to checks around the structure of switch in the relevant method in Check. Additionally a check was needed in analyzePattern to detect that when a case starts with a constant case label followed by a , or -> is indeed a constant expression and not a pattern as previously signified.


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

Issues

  • JDK-8314423: Multiple patterns without unnamed variables (Bug - P3)
  • JDK-8314216: Case enumConstant, pattern compilation fails (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15310

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 16, 2023

👋 Welcome back abimpoudis! 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 Pull request is ready for review label Aug 16, 2023
@openjdk
Copy link

openjdk bot commented Aug 16, 2023

@biboudis The following label will be automatically applied to this pull request:

  • compiler

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 compiler compiler-dev@openjdk.org label Aug 16, 2023
@biboudis
Copy link
Member Author

/issue add JDK-8314216

@openjdk
Copy link

openjdk bot commented Aug 16, 2023

@biboudis
Adding additional issue to issue list: 8314216: Case enumConstant, pattern compilation fails.

@mlbridge
Copy link

mlbridge bot commented Aug 16, 2023

Webrevs

Copy link
Contributor

@lahodaj lahodaj left a comment

Choose a reason for hiding this comment

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

Looks reasonable, with some comments.

test/langtools/tools/javac/T8314216.java Outdated Show resolved Hide resolved
test/langtools/tools/javac/T8314423.java Show resolved Hide resolved
Copy link
Contributor

@lahodaj lahodaj left a comment

Choose a reason for hiding this comment

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

Looks good to me.

test/langtools/tools/javac/T8314423.java Show resolved Hide resolved
@openjdk
Copy link

openjdk bot commented Aug 16, 2023

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

8314423: Multiple patterns without unnamed variables
8314216: Case enumConstant, pattern compilation fails

Reviewed-by: jlahoda

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

  • 249dc37: 8314321: Remove unused field jdk.internal.util.xml.impl.Attrs.mAttrIdx
  • b78f5a1: 8314076: ICC_ColorSpace#minVal/maxVal have the opposite description
  • 2a1176b: 8314276: Improve PtrQueue API around size/capacity
  • 0c3bc71: 8281169: Expand discussion of elements and types
  • f143380: 8314240: test/jdk/sun/security/pkcs/pkcs7/SignerOrder.java fails to compile
  • 6b396da: 8062795: (fs) Files.setPermissions requires read access when NOFOLLOW_LINKS specified
  • 7b28d36: 8314330: java/foreign tests should respect vm flags when start new processes
  • b32d641: 8311943: Cleanup usages of toLowerCase() and toUpperCase() in java.base
  • 13f6450: 8313765: Invalid CEN header (invalid zip64 extra data field size)
  • 24e896d: 8310275: Bug in assignment operator of ReservedMemoryRegion
  • ... and 1 more: https://git.openjdk.org/jdk/compare/b80001de0c0aeedeb412430660a4727fc26be98b...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. Possible candidates are the reviewers of this PR (@lahodaj) but any other Committer may sponsor as well.

➡️ 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 added the ready Pull request is ready to be integrated label Aug 16, 2023
@biboudis
Copy link
Member Author

/backport jdk21

@openjdk
Copy link

openjdk bot commented Aug 16, 2023

@biboudis Backport for repo openjdk/jdk21 on branch master was successfully enabled and will be performed once this pull request has been integrated. Further instructions will be provided at that time.

@biboudis
Copy link
Member Author

/backport disable

@openjdk
Copy link

openjdk bot commented Aug 16, 2023

@biboudis Usage: /backport [disable] <repository> [<branch>]

@biboudis
Copy link
Member Author

/backport disable jdk21

@openjdk
Copy link

openjdk bot commented Aug 16, 2023

@biboudis Backport for repo jdk21 on branch master was already disabled.

@biboudis
Copy link
Member Author

/backport disable jdk21 master

@openjdk
Copy link

openjdk bot commented Aug 16, 2023

@biboudis Backport for repo jdk21 on branch master was already disabled.

@biboudis
Copy link
Member Author

/backport disable openjdk/jdk21

@openjdk
Copy link

openjdk bot commented Aug 16, 2023

@biboudis Backport for repo openjdk/jdk21 on branch master was successfully disabled.

@biboudis
Copy link
Member Author

/integrate

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

openjdk bot commented Aug 17, 2023

@biboudis
Your change (at version 07308ba) is now ready to be sponsored by a Committer.

@lahodaj
Copy link
Contributor

lahodaj commented Aug 17, 2023

/sponsor

@openjdk
Copy link

openjdk bot commented Aug 17, 2023

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

  • 249dc37: 8314321: Remove unused field jdk.internal.util.xml.impl.Attrs.mAttrIdx
  • b78f5a1: 8314076: ICC_ColorSpace#minVal/maxVal have the opposite description
  • 2a1176b: 8314276: Improve PtrQueue API around size/capacity
  • 0c3bc71: 8281169: Expand discussion of elements and types
  • f143380: 8314240: test/jdk/sun/security/pkcs/pkcs7/SignerOrder.java fails to compile
  • 6b396da: 8062795: (fs) Files.setPermissions requires read access when NOFOLLOW_LINKS specified
  • 7b28d36: 8314330: java/foreign tests should respect vm flags when start new processes
  • b32d641: 8311943: Cleanup usages of toLowerCase() and toUpperCase() in java.base
  • 13f6450: 8313765: Invalid CEN header (invalid zip64 extra data field size)
  • 24e896d: 8310275: Bug in assignment operator of ReservedMemoryRegion
  • ... and 1 more: https://git.openjdk.org/jdk/compare/b80001de0c0aeedeb412430660a4727fc26be98b...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Aug 17, 2023
@openjdk openjdk bot closed this Aug 17, 2023
@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 17, 2023
@openjdk
Copy link

openjdk bot commented Aug 17, 2023

@lahodaj @biboudis Pushed as commit 4331193.

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

@biboudis
Copy link
Member Author

/backport jdk21u

@openjdk
Copy link

openjdk bot commented Aug 17, 2023

@biboudis the backport was successfully created on the branch biboudis-backport-43311930 in my personal fork of openjdk/jdk21u. To create a pull request with this backport targeting openjdk/jdk21u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 43311930 from the openjdk/jdk repository.

The commit being backported was authored by Aggelos Biboudis on 17 Aug 2023 and was reviewed by Jan Lahoda.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk21u:

$ git fetch https://github.com/openjdk-bots/jdk21u.git biboudis-backport-43311930:biboudis-backport-43311930
$ git checkout biboudis-backport-43311930
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21u.git biboudis-backport-43311930

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
compiler compiler-dev@openjdk.org integrated Pull request has been integrated
2 participants