8300543 Compiler Implementation for Pattern Matching for switch by lahodaj · Pull Request #13074 · openjdk/jdk

lahodaj · 2023-03-17T12:15:58Z

This is the first draft of a patch for JEP 440 and JEP 441. Changes included:

the pattern matching for switch and record patterns features are made final, together with updates to tests.
parenthesized patterns are removed.
qualified enum constants are supported for case labels.

This change herein also includes removal record patterns in for each loop, which may be split into a separate PR in the future.

/issue JDK-8300545

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Change requires CSR request JDK-8304394 to be approved
Commit message must refer to an issue
Change requires CSR request JDK-8304401 to be approved

Issues

JDK-8300543: Compiler Implementation for Pattern Matching for switch
JDK-8300545: Compiler Implementation for Record Patterns
JDK-8304394: Compiler Implementation for Pattern Matching for switch (CSR)
JDK-8304401: Compiler Implementation for Record Patterns (CSR)

Reviewers

Vicente Romero (@vicente-romero-oracle - Reviewer) ⚠️ Review applies to 924ca58d
Maurizio Cimadamore (@mcimadamore - Reviewer) ⚠️ Review applies to f0584725

Contributors

Aggelos Biboudis <abimpoudis@openjdk.org>

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 13074

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

Using diff file

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

Webrev

Link to Webrev Comment

…arse errors when deconstructing a record using the enhanced for loop of JEP 432" This reverts commit 2cb64a7

…parenthesized-patterns

bridgekeeper · 2023-03-17T12:17:12Z

👋 Welcome back jlahoda! 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 · 2023-03-17T12:20:03Z

@lahodaj
Adding additional issue to issue list: 8300545: Compiler Implementation for Record Patterns.

openjdk · 2023-03-17T12:22:45Z

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

compiler
core-libs

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.

…0543

mcimadamore · 2023-04-25T09:40:51Z

src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java

     * If no element in the {@code labels} array matches the target, then
     * the method of the call site return the length of the {@code labels} array.
+     * <p>
+     * The value of the {@code restart} index must be between {@code 0} and


This description is a bit ambiguous - not clear whether it's 0 < x < length, or 0 <= x < length.

mcimadamore

Added some comments in the exhaustiveness test

mcimadamore · 2023-04-25T10:22:40Z

test/langtools/tools/javac/patterns/Exhaustiveness.java

Isn't Isn't testCoversType1the same astestExhaustiveStatement3` ?

Some of the tests called testExhaustiveStatement do not seem to test statements at all

In the two testXYZExhaustiveIntersection the class hierarchy seems the same - can we reuse it across multiple test cases? I see something similar done in testOnlyApplicable.

The name testX doesn't seem very expressive - maybe testRecords ?

openjdk · 2023-05-10T11:35:26Z

@lahodaj this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout JDK-8300543
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

openjdk · 2023-05-18T22:00:46Z

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

8300543: Compiler Implementation for Pattern Matching for switch
8300545: Compiler Implementation for Record Patterns

Co-authored-by: Aggelos Biboudis <abimpoudis@openjdk.org>
Reviewed-by: vromero, mcimadamore

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

5ccc962: 8308342: Remove MetaspaceClosure::Ref::keep_after_pushing()
a0f4a94: 8307783: runtime/reflect/ReflectOutOfMemoryError.java timed out
939344b: 8304685: Fix whitespace parsing in libjdwp
241455f: 8307962: Exclude gc/g1/TestSkipRebuildRemsetPhase.java fails with virtual test thread factory
34468e1: 8308021: Update IANA Language Subtag Registry to Version 2023-05-11
f0aebc8: 8305972: Update XML Security for Java to 3.0.2
265f40b: 8308396: Fix offset_of conversion warnings in runtime code
a5343fa: 8281149: (fs) java/nio/file/FileStore/Basic.java fails with java.lang.RuntimeException: values differ by more than 1GB
44218b1: 8308248: Revisit alignment of layout constants on 32-bit platforms
80ef5c2: 8308410: broken compilation of test\jdk\tools\launcher\exeJliLaunchTest.c
... and 125 more: https://git.openjdk.org/jdk/compare/2bf7ac58b7971f6813066dac7e88a855d597d731...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.

vicente-romero-oracle

minor comment, looks good

vicente-romero-oracle · 2023-05-18T22:32:42Z

test/langtools/tools/javac/T8297602.java

 * @bug 8297602
 * @summary Compiler crash with type annotation and generic record during pattern matching
- * @compile -XDrawDiagnostics T8297602.java
+ * @compile/fail/ref=T8297602.out -XDrawDiagnostics T8297602.java


I think that this test can be eliminated as new test AnnotationErrors supersedes it.

lahodaj · 2023-05-22T04:11:26Z

/contributor add @biboudis

openjdk · 2023-05-22T04:12:47Z

@lahodaj
Contributor Aggelos Biboudis <abimpoudis@openjdk.org> successfully added.

lahodaj · 2023-05-22T04:16:30Z

/inetgrate

openjdk · 2023-05-22T04:18:01Z

@lahodaj Unknown command inetgrate - for a list of valid commands use /help.

lahodaj · 2023-05-22T04:22:17Z

/integrate

openjdk · 2023-05-22T04:24:20Z

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

5ccc962: 8308342: Remove MetaspaceClosure::Ref::keep_after_pushing()
a0f4a94: 8307783: runtime/reflect/ReflectOutOfMemoryError.java timed out
939344b: 8304685: Fix whitespace parsing in libjdwp
241455f: 8307962: Exclude gc/g1/TestSkipRebuildRemsetPhase.java fails with virtual test thread factory
34468e1: 8308021: Update IANA Language Subtag Registry to Version 2023-05-11
f0aebc8: 8305972: Update XML Security for Java to 3.0.2
265f40b: 8308396: Fix offset_of conversion warnings in runtime code
a5343fa: 8281149: (fs) java/nio/file/FileStore/Basic.java fails with java.lang.RuntimeException: values differ by more than 1GB
44218b1: 8308248: Revisit alignment of layout constants on 32-bit platforms
80ef5c2: 8308410: broken compilation of test\jdk\tools\launcher\exeJliLaunchTest.c
... and 125 more: https://git.openjdk.org/jdk/compare/2bf7ac58b7971f6813066dac7e88a855d597d731...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-05-22T04:24:37Z

@lahodaj Pushed as commit eaa80ad.

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

biboudis and others added 7 commits January 27, 2023 14:17

Revert "8294943: Implement record patterns in enhanced for 8296802: P…

e615205

…arse errors when deconstructing a record using the enhanced for loop of JEP 432" This reverts commit 2cb64a7

Finalizing patterns in switch and record patterns features.

4074095

Fixing tests.

15faf6e

Parenthesized pattern removed.

3fc285e

Merge branch 'master' into pattern-match-switch-records-final-remote-…

1ae0d16

…parenthesized-patterns

Adding support for qualified enum constants.

da19aa1

Merge branch 'master' into JDK-8300543

5a72548

lahodaj marked this pull request as draft March 17, 2023 12:16

openjdk bot added core-libs core-libs-dev@openjdk.org compiler compiler-dev@openjdk.org csr Pull request needs approved CSR before integration labels Mar 17, 2023

lahodaj added 16 commits March 21, 2023 12:48

Fixing tests.

4dd3192

Some version

bd28d2d

Progress.

b87f305

Fixing build.

bbc4352

Adding test.

7047b4a

Attempting to cleanup, speed up and document the exhaustivity algorithm.

6a59f8b

Fixing handling of intersection types.

d6b1806

Support for 'overfitting' patterns.

7dcdd1d

Merge branch 'master' into JDK-8300543

4c2c40f

Merge remote-tracking branch 'jdk/reduce-exhaustiveness' into JDK-830…

3d553d3

…0543

Post-merge fix.

b54c8b6

Fixing tests.

80414aa

Removing trailing whitespace

ff689dd

Merge branch 'master' into JDK-8300543

1c1245d

Merge branch 'master' into JDK-8300543

01ae6dd

Adding test for incorrectly used guards.

74d2a49

mcimadamore reviewed Apr 25, 2023

View reviewed changes

mcimadamore approved these changes Apr 25, 2023

View reviewed changes

lahodaj added 5 commits April 25, 2023 13:39

Merge branch 'master' into JDK-8300543

35f5156

Cleanup: reflecting review feedback.

3b3bcbc

Reverting use of record patterns in enhanced for loop.

94c7d32

Merge branch 'master' into JDK-8300543

b3c0d46

Updating MatchException javadoc.

79bbd71

openjdk bot added the merge-conflict Pull request has merge conflict with target branch label May 10, 2023

Merge branch 'master' into JDK-8300543

69ba2a5

openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label May 11, 2023

openjdk bot mentioned this pull request May 15, 2023

8308093: Disable language preview features use in JDK #13985

Closed

3 tasks

openjdk bot added ready Pull request is ready to be integrated and removed csr Pull request needs approved CSR before integration labels May 18, 2023

Disallowing annotations on record patterns.

924ca58

vicente-romero-oracle approved these changes May 18, 2023

View reviewed changes

Removing obsolette test, as suggested.

b641efc

lahodaj mentioned this pull request May 19, 2023

8291966: SwitchBootstrap.typeSwitch could be faster #9779

Closed

3 tasks

openjdk bot added the integrated Pull request has been integrated label May 22, 2023

openjdk bot closed this May 22, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 22, 2023

Conversation

lahodaj commented Mar 17, 2023 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issues

Reviewers

Contributors

Reviewing

Webrev

Uh oh!

bridgekeeper bot commented Mar 17, 2023

Uh oh!

openjdk bot commented Mar 17, 2023

Uh oh!

openjdk bot commented Mar 17, 2023

Uh oh!

mcimadamore Apr 25, 2023

Choose a reason for hiding this comment

Uh oh!

mcimadamore left a comment

Choose a reason for hiding this comment

Uh oh!

mcimadamore Apr 25, 2023

Choose a reason for hiding this comment

Uh oh!

mcimadamore Apr 25, 2023

Choose a reason for hiding this comment

Uh oh!

mcimadamore Apr 25, 2023

Choose a reason for hiding this comment

Uh oh!

mcimadamore Apr 25, 2023

Choose a reason for hiding this comment

Uh oh!

openjdk bot commented May 10, 2023

Uh oh!

openjdk bot commented May 18, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vicente-romero-oracle left a comment

Choose a reason for hiding this comment

Uh oh!

vicente-romero-oracle May 18, 2023

Choose a reason for hiding this comment

Uh oh!

lahodaj commented May 22, 2023

Uh oh!

openjdk bot commented May 22, 2023

Uh oh!

lahodaj commented May 22, 2023

Uh oh!

openjdk bot commented May 22, 2023

Uh oh!

lahodaj commented May 22, 2023

Uh oh!

openjdk bot commented May 22, 2023

Uh oh!

openjdk bot commented May 22, 2023

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

9 participants

lahodaj commented Mar 17, 2023 •

edited by openjdk bot

Loading

openjdk bot commented May 18, 2023 •

edited

Loading