Skip to content

8364519: Sort share/classfile includes #26590

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

Closed
wants to merge 2 commits into from

Conversation

fandreuz
Copy link
Contributor

@fandreuz fandreuz commented Aug 1, 2025

This PR sorts the includes in hotspot/share/classfile using SortIncludes.java. I'm also adding the directory to TestIncludesAreSorted.

Passes tier1.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (2 reviews required, with at least 1 Reviewer, 1 Author)

Issue

  • JDK-8364519: Sort share/classfile includes (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 26590

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 1, 2025

👋 Welcome back fandreuz! 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 Aug 1, 2025

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

8364519: Sort share/classfile includes

Reviewed-by: shade, ayang

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 6 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 (@shipilev, @albertnetymk) 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 changed the title JDK-8364519: Sort share/classfile includes 8364519: Sort share/classfile includes Aug 1, 2025
@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 1, 2025
@openjdk
Copy link

openjdk bot commented Aug 1, 2025

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

  • hotspot

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 hotspot hotspot-dev@openjdk.org label Aug 1, 2025
@mlbridge
Copy link

mlbridge bot commented Aug 1, 2025

Webrevs

Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Looks fine, with a nit.

/reviewers 2

#include "oops/oop.hpp"
#include "oops/oop.inline.hpp"
Copy link
Member

Choose a reason for hiding this comment

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

Take this opportunity to remove the include of oop.hpp, since we are including oop.inline.hpp anyway?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure, I got a few here: 3477cbc

Could this be a possible improvement of SortIncludes.java?

Copy link
Member

Choose a reason for hiding this comment

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

Maybe, but it is not exactly the include order issue. We do these clean ups opportunistically, when it is glaringly obvious it is an unnecessary include.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Aug 1, 2025
@openjdk
Copy link

openjdk bot commented Aug 1, 2025

@shipilev
The total number of required reviews for this PR (including the jcheck configuration and the last /reviewers command) is now set to 2 (with at least 1 Reviewer, 1 Author).

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Aug 1, 2025
#include "oops/oop.hpp"
#include "oops/oop.inline.hpp"
Copy link
Member

Choose a reason for hiding this comment

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

Maybe, but it is not exactly the include order issue. We do these clean ups opportunistically, when it is glaringly obvious it is an unnecessary include.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Aug 1, 2025
@fandreuz
Copy link
Contributor Author

fandreuz commented Aug 1, 2025

/integrate

@fandreuz
Copy link
Contributor Author

fandreuz commented Aug 1, 2025

The test failure does not seem to be related to the changes in this PR

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

openjdk bot commented Aug 1, 2025

@fandreuz
Your change (at version 3477cbc) is now ready to be sponsored by a Committer.

@shipilev
Copy link
Member

shipilev commented Aug 4, 2025

/sponsor

@openjdk
Copy link

openjdk bot commented Aug 4, 2025

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

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Aug 4, 2025
@openjdk openjdk bot closed this Aug 4, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Aug 4, 2025
@openjdk
Copy link

openjdk bot commented Aug 4, 2025

@shipilev @fandreuz Pushed as commit 3387b31.

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

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

Successfully merging this pull request may close these issues.

3 participants