-
Notifications
You must be signed in to change notification settings - Fork 5.8k
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
base: master
Are you sure you want to change the base?
8354309: Sort GC includes #24581
Conversation
👋 Welcome back stefank! A progress list of the required criteria for merging this PR into |
@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:
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
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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice. Looks good.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Need to update the list of source directories to check in the test.
https://github.com/openjdk/jdk/blame/d4e194bc463ff3ad09e55cbb96bea00283679ce6/test/hotspot/jtreg/sources/TestIncludesAreSorted.java#L45-L50
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? |
Not a strong opinion, but I would prefer to check automatically in some way. Does not need every run of tier1. |
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
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