Skip to content

JDK-8312415: Expand -Xlint:serial checks to enum constants with specialized class bodies#15004

Closed
jddarcy wants to merge 3 commits intoopenjdk:masterfrom
jddarcy:JDK-8312415
Closed

JDK-8312415: Expand -Xlint:serial checks to enum constants with specialized class bodies#15004
jddarcy wants to merge 3 commits intoopenjdk:masterfrom
jddarcy:JDK-8312415

Conversation

@jddarcy
Copy link
Member

@jddarcy jddarcy commented Jul 24, 2023

Thanks to @lahodaj for providing the code to bridge into the class used for a enum constant with a specialized body.

This changes expands serialization warnings to the contents of any such class bodies.


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-8312415: Expand -Xlint:serial checks to enum constants with specialized class bodies (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15004

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 24, 2023

👋 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
Copy link

openjdk bot commented Jul 24, 2023

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

@openjdk openjdk bot added the compiler compiler-dev@openjdk.org label Jul 24, 2023
@openjdk openjdk bot added the rfr Pull request is ready for review label Jul 24, 2023
@mlbridge
Copy link

mlbridge bot commented Jul 24, 2023

Webrevs


case ENUM_CONSTANT -> {
var field = (VarSymbol)enclosed;
if (field.isEnum()) {
Copy link
Contributor

Choose a reason for hiding this comment

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

It's not wrong, but is this check redundant? When can an ENUM_CONSTANT not be isEnum() ?

Copy link
Contributor

Choose a reason for hiding this comment

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

See these lines in Symbol.java public ElementKind getKind() line 1725:

            } else if ((flags & ENUM) != 0) {
                return ElementKind.ENUM_CONSTANT;

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, sorry for that, I've originally had the code elsewhere. The isEnum check should not be needed here.

Copy link
Member Author

Choose a reason for hiding this comment

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

Code updated; all langtools tests pas when run locally. Thanks.

Copy link
Contributor

@jonathan-gibbons jonathan-gibbons left a comment

Choose a reason for hiding this comment

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

Approved, but see question for Check.java

@openjdk
Copy link

openjdk bot commented Jul 24, 2023

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

8312415: Expand -Xlint:serial checks to enum constants with specialized class bodies

Reviewed-by: jjg, 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 13 new commits pushed to the master branch:

  • c6396dc: 8039165: [Doc] MessageFormat null locale generates NullPointerException
  • 36f3bae: 8312401: SymbolTable::do_add_if_needed hangs when called in InstanceKlass::add_initialization_error path with requesting length exceeds max_symbol_length
  • e554fde: 8311592: ECKeySizeParameterSpec causes too many exceptions on third party providers
  • 9606cbc: 8312524: [JVMCI] serviceability/dcmd/compiler/CompilerQueueTest.java fails
  • 91fe032: 8312818: Incorrect format specifier in a HttpClient log message
  • bd09880: 8312512: sspi.cpp avoid some NULL checks related to free and delete
  • b35ccb2: 8312533: JFR: No message for JFR.view when data is missing
  • ea067fc: 8312592: New parentheses warnings after HarfBuzz 7.2.0 update
  • 9999838: 8311646: ZGC: LIR_OpZStoreBarrier::_info shadows LIR_Op::_info
  • d63bff6: 8312578: Redundant javadoc in X400Address
  • ... and 3 more: https://git.openjdk.org/jdk/compare/d8f2e9ae3b47b27e51680d88b774183cd156b073...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 Pull request is ready to be integrated label Jul 24, 2023
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 to me.


case ENUM_CONSTANT -> {
var field = (VarSymbol)enclosed;
if (field.isEnum()) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, sorry for that, I've originally had the code elsewhere. The isEnum check should not be needed here.

@jddarcy
Copy link
Member Author

jddarcy commented Jul 25, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jul 25, 2023

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

  • c6396dc: 8039165: [Doc] MessageFormat null locale generates NullPointerException
  • 36f3bae: 8312401: SymbolTable::do_add_if_needed hangs when called in InstanceKlass::add_initialization_error path with requesting length exceeds max_symbol_length
  • e554fde: 8311592: ECKeySizeParameterSpec causes too many exceptions on third party providers
  • 9606cbc: 8312524: [JVMCI] serviceability/dcmd/compiler/CompilerQueueTest.java fails
  • 91fe032: 8312818: Incorrect format specifier in a HttpClient log message
  • bd09880: 8312512: sspi.cpp avoid some NULL checks related to free and delete
  • b35ccb2: 8312533: JFR: No message for JFR.view when data is missing
  • ea067fc: 8312592: New parentheses warnings after HarfBuzz 7.2.0 update
  • 9999838: 8311646: ZGC: LIR_OpZStoreBarrier::_info shadows LIR_Op::_info
  • d63bff6: 8312578: Redundant javadoc in X400Address
  • ... and 3 more: https://git.openjdk.org/jdk/compare/d8f2e9ae3b47b27e51680d88b774183cd156b073...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jul 25, 2023
@openjdk openjdk bot closed this Jul 25, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 25, 2023
@openjdk
Copy link

openjdk bot commented Jul 25, 2023

@jddarcy Pushed as commit cb82c95.

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

@jddarcy jddarcy deleted the JDK-8312415 branch October 17, 2024 16:52
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

Development

Successfully merging this pull request may close these issues.

3 participants