8333725: Compiler Prototyping for Deconstructors #94

biboudis · 2024-05-13T14:10:31Z

Work-in-progress prototyping of deconstructors.

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

Issue

JDK-8333725: Compiler Prototyping for Deconstructors (Enhancement - P4)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 94

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/amber/pull/94.diff

bridgekeeper · 2024-05-13T14:11:17Z

👋 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 · 2024-05-13T14:11:29Z

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

openjdk · 2024-05-13T14:12:11Z

@biboudis 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 matchers-experiment
git fetch https://git.openjdk.org/amber.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

openjdk · 2024-05-13T14:23:28Z

⚠️ @biboudis This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

vicente-romero-oracle · 2024-06-01T00:18:38Z

src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java

@@ -4286,6 +4366,70 @@ public void visitRecordPattern(JCRecordPattern tree) {
        matchBindings = new MatchBindings(outBindings.toList(), List.nil());
    }

+    // todo: follow the protocol in Resolve::selectBest


this method I think belongs in Resolve

vicente-romero-oracle · 2024-06-01T00:23:48Z

src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java

@@ -2779,6 +2779,32 @@ public void visitMethodDef(JCMethodDecl tree) {
                syms.methodClass);
        }

+        if (tree.sym.isPattern()) {
+            tree.sym.flags_field  |= STATIC;
+            tree.sym.flags_field  |= SYNTHETIC;


we are making synthetic an AST that actually appears in the source?

src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java

test/test/Point.class

vicente-romero-oracle · 2024-06-04T15:20:30Z

src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java

+                expectedRecordTypes = record.getRecordComponents()
+                                            .stream()
+                                            .map(rc -> types.memberType(site, rc))
+                                            .map(t -> types.upward(t, types.captures(t)).baseType())


not sure why the upward projection is used here

src/java.base/share/classes/java/lang/Class.java

src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java

src/jdk.compiler/share/classes/com/sun/tools/javac/comp/MemberEnter.java

src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java

src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Items.java

vicente-romero-oracle · 2024-06-06T21:04:11Z

src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/PoolWriter.java

@@ -201,7 +202,7 @@ int putName(Name name) {
     * Puts a name and type pair into the pool and returns its index.
     */
    int putNameAndType(Symbol s) {
-        return pool.writeIfNeeded(new NameAndType(s.name, descriptorType(s)));
+        return pool.writeIfNeeded(new NameAndType(s instanceof MethodSymbol ms ? ms.externalName(types) : s.name, descriptorType(s)));


same not sure why you need this change

Co-authored-by: Angelos Bimpoudis <angelos.bimpoudis@oracle.com> Co-authored-by: Jan Lahoda <jan.lahoda@oracle.com> Co-authored-by: Vicente Romero <vicente.romero@oracle.com>

…o matchers-experiment # Conflicts: # src/java.base/share/classes/java/lang/Class.java

…or partial deconstructor exhaustiveness groups yet. (#15) * Attempting to add match-failed + partial deconstructors. No support for partial deconstructor exhaustiveness groups yet. * Error recovery.

Co-authored-by: Jan Lahoda <jan.lahoda@oracle.com>

* Erase pattern signature for records * Erase pattern signature for deconstructors

# Conflicts: # src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java

…d mangled name calculation

…ern. (#21)

…and match candidate yet. (#20) * First round of instance patterns. No patterns with separate instance and match candidate yet. * A very (VERY!) basic support for instance pattern with split receiver and match candidate. * Align calling convention between instance patterns and deconstructors * Fix adjustment of `syntheticPattern` computation --------- Co-authored-by: Angelos Bimpoudis <angelos.bimpoudis@oracle.com>

…23) * Instance patterns represented by instance methods in the translation * Second Approach: rely on the mangled name

bridgekeeper · 2025-03-26T18:43:38Z

@biboudis This pull request has been inactive for more than 16 weeks and will now be automatically closed. If you would like to continue working on this pull request in the future, feel free to reopen it! This can be done using the /open pull request command.

biboudis · 2025-03-26T18:50:58Z

/open

openjdk · 2025-03-26T18:51:07Z

@biboudis This pull request is now open

openjdk bot added the merge-conflict The pull request has a merge conflict with the target branch label May 13, 2024

biboudis marked this pull request as draft May 13, 2024 14:20

openjdk bot removed the merge-conflict The pull request has a merge conflict with the target branch label May 13, 2024

biboudis force-pushed the matchers-experiment branch from d635684 to ccc44d4 Compare May 27, 2024 11:24

vicente-romero-oracle reviewed Jun 1, 2024

View reviewed changes

src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java Outdated Show resolved Hide resolved

vicente-romero-oracle reviewed Jun 1, 2024

View reviewed changes

test/test/Point.class Outdated Show resolved Hide resolved

openjdk bot added the merge-conflict The pull request has a merge conflict with the target branch label Jun 3, 2024

vicente-romero-oracle reviewed Jun 4, 2024

View reviewed changes

openjdk bot removed the merge-conflict The pull request has a merge conflict with the target branch label Jun 6, 2024

biboudis force-pushed the matchers-experiment branch from 6138923 to 5246297 Compare June 6, 2024 13:46

biboudis changed the title ~~Pattern Declarations~~ Compiler Prototyping for Deconstructors Jun 6, 2024

biboudis changed the title ~~Compiler Prototyping for Deconstructors~~ 8333725: Compiler Prototyping for Deconstructors Jun 6, 2024

biboudis force-pushed the matchers-experiment branch 2 times, most recently from bf45138 to 250d702 Compare June 6, 2024 14:12

vicente-romero-oracle reviewed Jun 6, 2024

View reviewed changes

biboudis force-pushed the matchers-experiment branch from 250d702 to a19eff9 Compare June 6, 2024 21:13

8333725: Compiler Prototyping for Deconstructors

4c7b0ba

Co-authored-by: Angelos Bimpoudis <angelos.bimpoudis@oracle.com> Co-authored-by: Jan Lahoda <jan.lahoda@oracle.com> Co-authored-by: Vicente Romero <vicente.romero@oracle.com>

biboudis force-pushed the matchers-experiment branch from a19eff9 to 4c7b0ba Compare June 7, 2024 07:42

Fix translation of dtors with primitives and array types

61327bf

openjdk bot added the merge-conflict The pull request has a merge conflict with the target branch label Jun 17, 2024

Merge remote-tracking branch 'refs/remotes/upstream-amber/master' int…

80a3f46

…o matchers-experiment # Conflicts: # src/java.base/share/classes/java/lang/Class.java

openjdk bot removed the merge-conflict The pull request has a merge conflict with the target branch label Jun 17, 2024

biboudis added 2 commits June 17, 2024 16:14

Restore JTreg flag

875eb34

Address review 1/n

0eab5db

biboudis and others added 6 commits February 7, 2025 10:17

Improve error reporting around overloading

b314dba

Attempting to add match-failed + partial deconstructors. No support f…

e13c919

…or partial deconstructor exhaustiveness groups yet. (#15) * Attempting to add match-failed + partial deconstructors. No support for partial deconstructor exhaustiveness groups yet. * Error recovery.

Addding forgotten file. (#16)

6c08011

Fixing tests. (#17)

3466195

Co-authored-by: Jan Lahoda <jan.lahoda@oracle.com>

Erase pattern signature for deconstructors (implicit or explicit) (#19)

a0fb99f

* Erase pattern signature for records * Erase pattern signature for deconstructors

Merge branch 'master-amber' into matchers-experiment

c0e514b

# Conflicts: # src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java

openjdk bot removed the merge-conflict The pull request has a merge conflict with the target branch label Feb 12, 2025

biboudis and others added 15 commits February 12, 2025 15:42

Clean whitespaces

7e0ea40

Fix separate compilation issue for generic patterns in ClassReader an…

d96152d

…d mangled name calculation

Whitespaces

22fb2a2

Avoid null in PatternType

1ff137d

Precomputing accessors and Carrier constructor for the synthetic patt…

13bde79

…ern. (#21)

Handle MatchCandidate properly (#22)

bdb9836

Pretty

f90c88b

Merge branch 'master-amber' into matchers-experiment

3c91572

Restore deleted import

ed9b61a

Instance patterns represented by instance methods in the translation (#…

be40cc2

…23) * Instance patterns represented by instance methods in the translation * Second Approach: rely on the mangled name

Add static patterns (#24)

3cf5e66

Whitespaces

8d31a4d

Merge branch 'master-amber' into matchers-experiment

2ebceab

Homogenise translation. All pattern methods use one argument

3bfc549

bridgekeeper bot closed this Mar 26, 2025

openjdk bot reopened this Mar 26, 2025

biboudis and others added 2 commits March 28, 2025 14:24

Merge branch 'master-amber' into matchers-experiment

6dd8924

Add extra parameter for initialized carrier (#25)

be6c078

openjdk bot added the merge-conflict The pull request has a merge conflict with the target branch label Apr 23, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8333725: Compiler Prototyping for Deconstructors #94

8333725: Compiler Prototyping for Deconstructors #94

biboudis commented May 13, 2024 •

edited by openjdk bot

Loading

bridgekeeper bot commented May 13, 2024

openjdk bot commented May 13, 2024

openjdk bot commented May 13, 2024

openjdk bot commented May 13, 2024

vicente-romero-oracle Jun 1, 2024

vicente-romero-oracle Jun 1, 2024

vicente-romero-oracle Jun 4, 2024

vicente-romero-oracle Jun 6, 2024

bridgekeeper bot commented Mar 26, 2025

biboudis commented Mar 26, 2025

openjdk bot commented Mar 26, 2025

8333725: Compiler Prototyping for Deconstructors #94

Are you sure you want to change the base?

8333725: Compiler Prototyping for Deconstructors #94

Conversation

biboudis commented May 13, 2024 • edited by openjdk bot Loading

Progress

Issue

Reviewing

bridgekeeper bot commented May 13, 2024

openjdk bot commented May 13, 2024

openjdk bot commented May 13, 2024

openjdk bot commented May 13, 2024

vicente-romero-oracle Jun 1, 2024

Choose a reason for hiding this comment

vicente-romero-oracle Jun 1, 2024

Choose a reason for hiding this comment

vicente-romero-oracle Jun 4, 2024

Choose a reason for hiding this comment

vicente-romero-oracle Jun 6, 2024

Choose a reason for hiding this comment

bridgekeeper bot commented Mar 26, 2025

biboudis commented Mar 26, 2025

openjdk bot commented Mar 26, 2025

biboudis commented May 13, 2024 •

edited by openjdk bot

Loading