Skip to content

8362587: Sort share/oops includes #26386

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

Conversation

fandreuz
Copy link
Contributor

@fandreuz fandreuz commented Jul 18, 2025

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

Passes tier1 and tier2 tests, and GHA tests.


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-8362587: Sort share/oops includes (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 26386

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 18, 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 Jul 18, 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:

8362587: Sort share/oops includes

Reviewed-by: shade, dholmes

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:

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, @dholmes-ora) 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 rfr Pull request is ready for review label Jul 18, 2025
@openjdk
Copy link

openjdk bot commented Jul 18, 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.

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.

Let's see if this breaks any builds. Meanwhile, see comments.

Also, can you please explicitly run make test TEST=sources/TestIncludesAreSorted.java to make sure it works?

@mlbridge
Copy link

mlbridge bot commented Jul 18, 2025

Webrevs

@fandreuz
Copy link
Contributor Author

Also, can you please explicitly run make test TEST=sources/TestIncludesAreSorted.java to make sure it works?

Yeah I did that before opening the PR, the test is running happily:

==============================
Test summary
==============================
   TEST                                              TOTAL  PASS  FAIL ERROR  SKIP   
   jtreg:test/hotspot/jtreg/sources/TestIncludesAreSorted.java
                                                         1     1     0     0     0   
==============================
TEST SUCCESS

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.

Seems like we are good! Let's see if anyone from Runtime team agrees as well.

/reviewers 2

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

openjdk bot commented Jul 18, 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 Jul 18, 2025
@dholmes-ora
Copy link
Member

Yeah I did that before opening the PR, the test is running happily:

And yet you had an error in the order as @shipilev pointed out - so how does that work?

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

That all seems fine to me. Thanks

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jul 21, 2025
@shipilev
Copy link
Member

Yeah I did that before opening the PR, the test is running happily:

And yet you had an error in the order as @shipilev pointed out - so how does that work?

The test does not test its own declared package order, and it is not even supposed to, I think. So that one was purely cosmetic :)

@fandreuz
Copy link
Contributor Author

Thank you @shipilev and @dholmes-ora for your reviews.

@fandreuz
Copy link
Contributor Author

/integrate

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

openjdk bot commented Jul 21, 2025

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

@shipilev
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Jul 21, 2025

Going to push as commit 37b7070.
Since your change was applied there have been 13 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 Jul 21, 2025
@openjdk openjdk bot closed this Jul 21, 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 Jul 21, 2025
@openjdk
Copy link

openjdk bot commented Jul 21, 2025

@shipilev @fandreuz Pushed as commit 37b7070.

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

@dholmes-ora
Copy link
Member

The test does not test its own declared package order,

Sorry - yes completely misread that one.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot [email protected] integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants