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

8265130: Make ConstantDesc class hierarchy sealed #4135

Closed
wants to merge 4 commits into from

Conversation

GavinBierman
Copy link
Contributor

@GavinBierman GavinBierman commented May 20, 2021

Hi all,

Please review this patch to make the ConstantDesc hierarchy sealed, as was promised in its Javadoc, now that sealed classes are finalising in JDK 17.

Thanks,
Gavin


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8265130: Make ConstantDesc class hierarchy sealed

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/4135/head:pull/4135
$ git checkout pull/4135

Update a local copy of the PR:
$ git checkout pull/4135
$ git pull https://git.openjdk.java.net/jdk pull/4135/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4135

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/4135.diff

@GavinBierman
Copy link
Contributor Author

/csr

@bridgekeeper
Copy link

bridgekeeper bot commented May 20, 2021

👋 Welcome back gbierman! 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 rfr Pull request is ready for review csr Pull request needs approved CSR before integration labels May 20, 2021
@openjdk
Copy link

openjdk bot commented May 20, 2021

@GavinBierman this pull request will not be integrated until the CSR request JDK-8265131 for issue JDK-8265130 has been approved.

@openjdk
Copy link

openjdk bot commented May 20, 2021

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

  • core-libs

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 core-libs core-libs-dev@openjdk.org label May 20, 2021
@mlbridge
Copy link

mlbridge bot commented May 20, 2021

Webrevs

Copy link
Member

@mlchung mlchung left a comment

Choose a reason for hiding this comment

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

Looks like constants.patch is accidentally added in this commit. That should be removed.

@@ -56,7 +56,7 @@
*
* @since 12
*/
public abstract class DynamicConstantDesc<T>
non-sealed public abstract class DynamicConstantDesc<T>
Copy link
Member

Choose a reason for hiding this comment

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

can you explain why DynamicConstantDesc is non-sealed?

Copy link
Contributor Author

@GavinBierman GavinBierman May 20, 2021

Choose a reason for hiding this comment

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

It's a permitted subclass of ConstantDesc, so it must be either final, sealed, or non-sealed. Making it non-sealed means it can still be extended.

Copy link
Member

Choose a reason for hiding this comment

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

I should have made it clear. I was expecting DynamicConstantDesc should be sealed. Do you expect non-JDK implementation class extending DynamicConstantDesc?

Copy link
Contributor

@Thihup Thihup May 20, 2021

Choose a reason for hiding this comment

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

From the ConstantDesc Javadoc:

 * <p>Non-platform classes should not implement {@linkplain ConstantDesc} directly.
 * Instead, they should extend {@link DynamicConstantDesc} (as {@link EnumDesc}
 * and {@link VarHandleDesc} do.)

Copy link
Member

Choose a reason for hiding this comment

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

Thanks. I missed this javadoc.

* @see ConstantDescs
*
* @since 12
*/
public interface ClassDesc
sealed public interface ClassDesc
Copy link
Member

Choose a reason for hiding this comment

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

Should move sealed behind public per the blessed modifier order from JLS. https://docs.oracle.com/javase/specs/jls/se16/preview/specs/sealed-classes-jls.html#jls-8.1.1

Per http://openjdk.java.net/jeps/409 the finalized sealed classes have no difference from that in 16, so the order suggested there should be valid.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks. Now changed.

Copy link
Member

@JornVernee JornVernee left a comment

Choose a reason for hiding this comment

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

This looks good to me.

@JornVernee
Copy link
Member

Does this require a CSR as well?

I see a CSR here for another change that seals a hierarchy: https://bugs.openjdk.java.net/browse/JDK-8267506

@JornVernee
Copy link
Member

Ah, nvm, it's already indicated on the PR :)

Copy link
Contributor

@vicente-romero-oracle vicente-romero-oracle 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

@openjdk openjdk bot removed the csr Pull request needs approved CSR before integration label Jun 1, 2021
@openjdk
Copy link

openjdk bot commented Jun 1, 2021

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

8265130: Make ConstantDesc class hierarchy sealed

Reviewed-by: mchung, jvernee, vromero

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

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 (@mlchung, @JornVernee, @vicente-romero-oracle) 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 Jun 1, 2021
@GavinBierman
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 1, 2021
@openjdk
Copy link

openjdk bot commented Jun 1, 2021

@GavinBierman
Your change (at version c36075d) is now ready to be sponsored by a Committer.

@vicente-romero-oracle
Copy link
Contributor

/sponsor

@openjdk openjdk bot closed this Jun 2, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed sponsor Pull request is ready to be sponsored ready Pull request is ready to be integrated labels Jun 2, 2021
@openjdk openjdk bot removed the rfr Pull request is ready for review label Jun 2, 2021
@openjdk
Copy link

openjdk bot commented Jun 2, 2021

@vicente-romero-oracle @GavinBierman Since your change was applied there have been 151 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

Pushed as commit 379376f.

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

@mlbridge
Copy link

mlbridge bot commented Jun 2, 2021

Mailing list message from Brian Goetz on core-libs-dev:

The motivation here is that we wanted to preserve the ability to
describe "special" indy sites with special objects.? The standard
implementation can describe any indy site (bootstrap, static args,
invocation name and type), but some indy sites (e.g., lambda capture)
are "special".? It would be reasonable for a classfile parser to
"uplevel" such sites, so that (a) parsers could provide implementations
that interpret the semantics of the bootstrap argument list relative to
the known bootstrap method, and (b) so that class generators (including
compilers) could provide higher-level descriptions of the indy.? This
allows us to abstract away from the details of compiler translation, by
"unlowering" translation-by-indy for known bootstraps.

On 5/20/2021 7:43 PM, Mandy Chung wrote:

1 similar comment
@mlbridge
Copy link

mlbridge bot commented Jun 2, 2021

Mailing list message from Brian Goetz on core-libs-dev:

The motivation here is that we wanted to preserve the ability to
describe "special" indy sites with special objects.? The standard
implementation can describe any indy site (bootstrap, static args,
invocation name and type), but some indy sites (e.g., lambda capture)
are "special".? It would be reasonable for a classfile parser to
"uplevel" such sites, so that (a) parsers could provide implementations
that interpret the semantics of the bootstrap argument list relative to
the known bootstrap method, and (b) so that class generators (including
compilers) could provide higher-level descriptions of the indy.? This
allows us to abstract away from the details of compiler translation, by
"unlowering" translation-by-indy for known bootstraps.

On 5/20/2021 7:43 PM, Mandy Chung wrote:

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

Successfully merging this pull request may close these issues.

6 participants