> The sorted blocks of includes have deteriorated to the point that I felt > compelled to clean up some of the issues. > > 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.
Stefan Karlsson has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains three commits: - Cleanups - Merge remote-tracking branch 'upstream/master' into various_include_order_fixes - Various include order fixes ------------- Changes: https://git.openjdk.org/jdk/pull/11108/files Webrev: https://webrevs.openjdk.org/?repo=jdk&pr=11108&range=01 Stats: 323 lines in 116 files changed: 143 ins; 163 del; 17 mod Patch: https://git.openjdk.org/jdk/pull/11108.diff Fetch: git fetch https://git.openjdk.org/jdk pull/11108/head:pull/11108 PR: https://git.openjdk.org/jdk/pull/11108
