JDK-8300857: State return value for Types.asElement(NoType) explicitly #12159

jddarcy · 2023-01-24T05:38:36Z

Just sending out the proposed API changes for now, will add tests later.

Please also review the corresponding CSR JDK-8300951.

Progress

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

Issues

JDK-8300857: State return value for Types.asElement(NoType) explicitly
JDK-8300951: State return value for Types.asElement(NoType) explicitly (CSR)

Reviewers

Jonathan Gibbons (@jonathan-gibbons - Reviewer) ⚠️ Review applies to a60301ce

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12159

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

Using diff file

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

bridgekeeper · 2023-01-24T05:41:02Z

👋 Welcome back darcy! 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-01-24T05:43:25Z

@jddarcy 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.

mlbridge · 2023-01-24T05:46:33Z

Webrevs

pavelrappo

Thanks for doing this. It looks good. However, I'll leave it to compiler experts to formally approve the PR and review the CSR.

pavelrappo · 2023-01-24T10:16:33Z

src/java.compiler/share/classes/javax/lang/model/util/Types.java

+     * <li>{@linkplain TypeKind#EXECUTABLE executable types}
+     * <li>{@linkplain TypeKind#MODULE module pseudo-types}
+     * <li>{@linkplain TypeKind#NONE "none" pseudo-types}
+     * <li>{@linkplain TypeKind#NULL  null types}


Was that extra whitespace between NULL and null intended?

jddarcy · 2023-01-24T22:48:05Z

PS I purposely did not provide an explicit specification on how a TypeMirror with a kind of OTHER or ERROR might be handled here to preserve implementation flexibility.

As an aside, if we had more time for the original JSR 269 effort, we would likely have worked so that there was a PrimitiveElement enum to host the element form of the built-in primitive types, but we ran out of time do to that work. That would have allowed a fuller round-trip relation of

element.asType().asElement()

returning something equal to the initial value.

jddarcy · 2023-01-25T03:56:27Z

Quick discussion of the revised version of the patch:

After looking at the javac implementation, I added spec and implementation support for the type mirrors of packages and modules returning the element for the package or module. This was a very small addendum to add support and allows round-tripping in more cases.
Neither union types nor intersection types are in the explicitly mapped or explicitly not mapped lists. This types are generally returned from trees and elements modeling the inside of method bodies rather than the declaration-level structures in the standardized API.

The remaining explicitly listed types-without-elements are straightforward to generate via the standard APIs.

jonathan-gibbons · 2023-01-25T23:20:30Z

src/java.compiler/share/classes/javax/lang/model/util/Types.java

+     * The type may be a {@link DeclaredType} or {@link TypeVariable},
+     * or a pseudo-type for a {@linkplain TypeKind#PACKAGE package} or
+     * {@linkplain TypeKind#MODULE module}.


Commas look erratic.

The type may be A or B, or C

jonathan-gibbons · 2023-01-25T23:36:15Z

test/langtools/tools/javac/processing/model/util/types/TestAsElement.java

+
+

excess blank lines?

jonathan-gibbons · 2023-01-25T23:37:56Z

test/langtools/tools/javac/processing/model/util/types/TestAsElement.java

+    }
+
+    private void testRoundTripCases() {
+        expectRoundTrip(eltUtils.getPackageElement("java.lang"));


Maybe add a type element as well as the package element and module element

jonathan-gibbons

approved with quibbles for optional update

jonathan-gibbons · 2023-01-25T23:40:57Z

I like the presence of the new test ;-)

openjdk · 2023-01-26T02:11:50Z

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

8300857: State return value for Types.asElement(NoType) explicitly

Reviewed-by: jjg

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

7e951f4: 8301092: Add benchmark for CRC32
adcfd25: 8301098: Remove dead code FileMapInfo::stop_sharing_and_unmap()
9f0887e: 8296661: Typo Found In CSSParser.java
ccf2f58: 8300806: Update googletest to v1.13.0
edf1e1a: 8300592: ASan build does not correctly propagate options to some test launchers
e80b5ea: 8299635: Hotspot update for deprecated sprintf in Xcode 14
f279c75: 8300805: Update autoconf build-aux files with latest from 2022-09-17
a23ff63: 8301086: jdk/internal/util/ByteArray/ReadWriteValues.java fails with CompilationError
61775c8: 8300997: Add curl support to createJMHBundle.sh
8a47429: 8295944: Move the Http2TestServer and related classes into a package of its own
... and 36 more: https://git.openjdk.org/jdk/compare/1a3cb8c5018bc016c2ad6b078e4abe13b39d151c...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.

jddarcy · 2023-01-26T02:12:57Z

/integrate

openjdk · 2023-01-26T02:14:17Z

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

7e951f4: 8301092: Add benchmark for CRC32
adcfd25: 8301098: Remove dead code FileMapInfo::stop_sharing_and_unmap()
9f0887e: 8296661: Typo Found In CSSParser.java
ccf2f58: 8300806: Update googletest to v1.13.0
edf1e1a: 8300592: ASan build does not correctly propagate options to some test launchers
e80b5ea: 8299635: Hotspot update for deprecated sprintf in Xcode 14
f279c75: 8300805: Update autoconf build-aux files with latest from 2022-09-17
a23ff63: 8301086: jdk/internal/util/ByteArray/ReadWriteValues.java fails with CompilationError
61775c8: 8300997: Add curl support to createJMHBundle.sh
8a47429: 8295944: Move the Http2TestServer and related classes into a package of its own
... and 36 more: https://git.openjdk.org/jdk/compare/1a3cb8c5018bc016c2ad6b078e4abe13b39d151c...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-01-26T02:14:29Z

@jddarcy Pushed as commit b5a4744.

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

JDK-8300857: State return value for Types.asElement(NoType) explicitly

2defd82

openjdk bot added the csr Pull request needs approved CSR before integration label Jan 24, 2023

openjdk bot added the rfr Pull request is ready for review label Jan 24, 2023

openjdk bot added the compiler compiler-dev@openjdk.org label Jan 24, 2023

pavelrappo reviewed Jan 24, 2023

View reviewed changes

Refine spec, add regression test.

ff59f04

openjdk bot removed the rfr Pull request is ready for review label Jan 25, 2023

Applease jcheck.

a60301c

openjdk bot added the rfr Pull request is ready for review label Jan 25, 2023

jonathan-gibbons reviewed Jan 25, 2023

View reviewed changes

jonathan-gibbons approved these changes Jan 25, 2023

View reviewed changes

Respond to review feedback.

4cf4226

openjdk bot removed the csr Pull request needs approved CSR before integration label Jan 26, 2023

openjdk bot added the ready Pull request is ready to be integrated label Jan 26, 2023

openjdk bot added the integrated Pull request has been integrated label Jan 26, 2023

openjdk bot closed this Jan 26, 2023

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

jddarcy deleted the JDK-8300857 branch October 26, 2024 19:28

JDK-8300857: State return value for Types.asElement(NoType) explicitly #12159

JDK-8300857: State return value for Types.asElement(NoType) explicitly #12159

Uh oh!

Conversation

jddarcy commented Jan 24, 2023 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issues

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Jan 24, 2023

Uh oh!

openjdk bot commented Jan 24, 2023

Uh oh!

mlbridge bot commented Jan 24, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

pavelrappo left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pavelrappo Jan 24, 2023

Choose a reason for hiding this comment

Uh oh!

jddarcy commented Jan 24, 2023

Uh oh!

jddarcy commented Jan 25, 2023

Uh oh!

jonathan-gibbons Jan 25, 2023

Choose a reason for hiding this comment

Uh oh!

jonathan-gibbons Jan 25, 2023

Choose a reason for hiding this comment

Uh oh!

jonathan-gibbons Jan 25, 2023

Choose a reason for hiding this comment

Uh oh!

jonathan-gibbons left a comment

Choose a reason for hiding this comment

Uh oh!

jonathan-gibbons commented Jan 25, 2023

Uh oh!

openjdk bot commented Jan 26, 2023

Uh oh!

jddarcy commented Jan 26, 2023

Uh oh!

openjdk bot commented Jan 26, 2023

Uh oh!

openjdk bot commented Jan 26, 2023

Uh oh!

Uh oh!

jddarcy commented Jan 24, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Jan 24, 2023 •

edited

Loading

pavelrappo left a comment •

edited

Loading