Integrated: 8296886: Fix various include sort order issues
Stefan Karlsson
stefank at openjdk.org
Thu Nov 24 15:10:25 UTC 2022
On Fri, 11 Nov 2022 14:26:20 GMT, Stefan Karlsson <stefank at openjdk.org> wrote:
> The sorted blocks of includes have deteriorated to the point that I felt compelled to clean up some of the issues.
>
> *EDIT*: The below discussion has been deferred out of this PR. Now this only deals with fixing the placement and sorting of includes, plus some surrounding blank lines.
>
> One of the more prevalent issues is that files in src/hotspot/share/include are not properly sorted. There has been some discussion that that was done on purpose, but it just adds another exception to the include rules that don't have any practical purposes, IMHO. It also goes against our written style guide around include files. One argument why it was OK have the files in include/ pushed up to the top of the sorted block, was that the file was included without specifying a directory. That's an argument that contradicts how we treat platform-dependent files, which (unfortunately) often also are specified without a prefixed directory, so I don't think that's a good enough argument, again IMHO. To remove this special case, I've removed the extraneous make file entry to have src/hotspot/share/include in the set of directories to search for headers when compiling HotSpot. Now all the header files in src/hotspot/share/include gets included by specifying the path from src/hotspot/share,
just like the other platform-independent headers in HotSpot.
>
> While going over the include headers I've also cleaned up surrounding whitespaces and incorrect include guards.
This pull request has now been integrated.
Changeset: df6cf1e4
Author: Stefan Karlsson <stefank at openjdk.org>
URL: https://git.openjdk.org/jdk/commit/df6cf1e41d0fc2dd5f5c094f66c7c8969cf5548d
Stats: 325 lines in 116 files changed: 143 ins; 164 del; 18 mod
8296886: Fix various include sort order issues
Reviewed-by: kbarrett, dholmes, stuefe
-------------
PR: https://git.openjdk.org/jdk/pull/11108
More information about the build-dev
mailing list