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

8354309: Sort GC includes #24581

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

stefank
Copy link
Member

@stefank stefank commented Apr 10, 2025

We now have a tool to fix our include lines to better adhere to the HotSpot Style Guide. See test/hotspot/jtreg/sources/SortIncludes.java. I've run the tool against the GC code and propose the resulting changes. I did one manual change to move a section guarded with INCLUDE_JFR.

Builds successfully with GHA. I will run this through tier1-2.


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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 24581

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 10, 2025

👋 Welcome back stefank! 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 Apr 10, 2025

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

8354309: Sort GC includes

Reviewed-by: eosterlund, iwalulya

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

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 10, 2025
@openjdk
Copy link

openjdk bot commented Apr 10, 2025

@stefank The following labels will be automatically applied to this pull request:

  • hotspot
  • shenandoah

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added hotspot hotspot-dev@openjdk.org shenandoah shenandoah-dev@openjdk.org labels Apr 10, 2025
@mlbridge
Copy link

mlbridge bot commented Apr 10, 2025

Webrevs

Copy link
Contributor

@fisk fisk left a comment

Choose a reason for hiding this comment

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

Nice. Looks good.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 10, 2025
Copy link
Member

@walulyai walulyai left a comment

Choose a reason for hiding this comment

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

LGTM!

Copy link

@kimbarrett kimbarrett left a comment

Choose a reason for hiding this comment

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

@stefank
Copy link
Member Author

stefank commented Apr 11, 2025

I don't think my patch needs to add this to the test.

Adding the GC directories to the test will make a small mistake in the include order a tier1 failure, and I'm not yet convinced that that is a good thing compared to lazily fixing sort order problems.

Any other Reviewers that have a strong opinion about this?

@tschatzl
Copy link
Contributor

Any other Reviewers that have a strong opinion about this?

Not a strong opinion, but I would prefer to check automatically in some way. Does not need every run of tier1.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot hotspot-dev@openjdk.org ready Pull request is ready to be integrated rfr Pull request is ready for review shenandoah shenandoah-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

5 participants