From 4629ccf9f868ec4aff0ed9daa6f52541aed78276 Mon Sep 17 00:00:00 2001 From: Francesco Andreuzzi Date: Fri, 1 Aug 2025 09:35:12 +0000 Subject: [PATCH 1/2] sort --- src/hotspot/share/classfile/classFileParser.cpp | 2 +- src/hotspot/share/classfile/classLoader.cpp | 2 +- src/hotspot/share/classfile/defaultMethods.cpp | 6 +++--- src/hotspot/share/classfile/defaultMethods.hpp | 2 +- src/hotspot/share/classfile/fieldLayoutBuilder.cpp | 2 +- src/hotspot/share/classfile/javaClasses.cpp | 4 ++-- src/hotspot/share/classfile/packageEntry.cpp | 2 +- src/hotspot/share/classfile/packageEntry.hpp | 2 +- src/hotspot/share/classfile/placeholders.cpp | 2 +- src/hotspot/share/classfile/systemDictionary.cpp | 2 +- src/hotspot/share/classfile/systemDictionaryShared.cpp | 2 +- src/hotspot/share/classfile/systemDictionaryShared.hpp | 2 +- src/hotspot/share/classfile/verifier.cpp | 2 +- src/hotspot/share/classfile/vmIntrinsics.cpp | 6 +++--- src/hotspot/share/classfile/vmIntrinsics.hpp | 2 +- src/hotspot/share/classfile/vmSymbols.cpp | 2 +- src/hotspot/share/classfile/vmSymbols.hpp | 2 +- test/hotspot/jtreg/sources/TestIncludesAreSorted.java | 1 + 18 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/hotspot/share/classfile/classFileParser.cpp b/src/hotspot/share/classfile/classFileParser.cpp index 1499c0a83811e..9aca20ee29f1c 100644 --- a/src/hotspot/share/classfile/classFileParser.cpp +++ b/src/hotspot/share/classfile/classFileParser.cpp @@ -77,8 +77,8 @@ #include "utilities/bitMap.inline.hpp" #include "utilities/checkedCast.hpp" #include "utilities/copy.hpp" -#include "utilities/formatBuffer.hpp" #include "utilities/exceptions.hpp" +#include "utilities/formatBuffer.hpp" #include "utilities/globalDefinitions.hpp" #include "utilities/growableArray.hpp" #include "utilities/macros.hpp" diff --git a/src/hotspot/share/classfile/classLoader.cpp b/src/hotspot/share/classfile/classLoader.cpp index 359970a3bcdff..e515966270846 100644 --- a/src/hotspot/share/classfile/classLoader.cpp +++ b/src/hotspot/share/classfile/classLoader.cpp @@ -80,8 +80,8 @@ #include "utilities/ostream.hpp" #include "utilities/utf8.hpp" -#include #include +#include // Entry point in java.dll for path canonicalization diff --git a/src/hotspot/share/classfile/defaultMethods.cpp b/src/hotspot/share/classfile/defaultMethods.cpp index f84c3b65f5fbd..80de93261f49e 100644 --- a/src/hotspot/share/classfile/defaultMethods.cpp +++ b/src/hotspot/share/classfile/defaultMethods.cpp @@ -35,13 +35,13 @@ #include "memory/metadataFactory.hpp" #include "memory/resourceArea.hpp" #include "memory/universe.hpp" +#include "oops/instanceKlass.hpp" +#include "oops/klass.hpp" +#include "oops/method.hpp" #include "prims/jvmtiExport.hpp" #include "runtime/handles.inline.hpp" #include "runtime/javaThread.hpp" #include "runtime/signature.hpp" -#include "oops/instanceKlass.hpp" -#include "oops/klass.hpp" -#include "oops/method.hpp" #include "utilities/accessFlags.hpp" #include "utilities/exceptions.hpp" #include "utilities/ostream.hpp" diff --git a/src/hotspot/share/classfile/defaultMethods.hpp b/src/hotspot/share/classfile/defaultMethods.hpp index 2176488726de1..c369cdc6cfdbb 100644 --- a/src/hotspot/share/classfile/defaultMethods.hpp +++ b/src/hotspot/share/classfile/defaultMethods.hpp @@ -26,8 +26,8 @@ #define SHARE_CLASSFILE_DEFAULTMETHODS_HPP #include "runtime/handles.hpp" -#include "utilities/growableArray.hpp" #include "utilities/exceptions.hpp" +#include "utilities/growableArray.hpp" class InstanceKlass; class Symbol; diff --git a/src/hotspot/share/classfile/fieldLayoutBuilder.cpp b/src/hotspot/share/classfile/fieldLayoutBuilder.cpp index 03afe89f4f8aa..21f47e3de10d9 100644 --- a/src/hotspot/share/classfile/fieldLayoutBuilder.cpp +++ b/src/hotspot/share/classfile/fieldLayoutBuilder.cpp @@ -28,8 +28,8 @@ #include "memory/resourceArea.hpp" #include "oops/array.hpp" #include "oops/fieldStreams.inline.hpp" -#include "oops/instanceMirrorKlass.hpp" #include "oops/instanceKlass.inline.hpp" +#include "oops/instanceMirrorKlass.hpp" #include "oops/klass.inline.hpp" #include "runtime/fieldDescriptor.inline.hpp" diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp index 2dcfc43898c4b..41a2a17579af0 100644 --- a/src/hotspot/share/classfile/javaClasses.cpp +++ b/src/hotspot/share/classfile/javaClasses.cpp @@ -60,10 +60,10 @@ #include "oops/method.inline.hpp" #include "oops/objArrayKlass.hpp" #include "oops/objArrayOop.inline.hpp" -#include "oops/oopCast.inline.hpp" #include "oops/oop.inline.hpp" -#include "oops/symbol.hpp" +#include "oops/oopCast.inline.hpp" #include "oops/recordComponent.hpp" +#include "oops/symbol.hpp" #include "oops/typeArrayOop.inline.hpp" #include "prims/jvmtiExport.hpp" #include "prims/methodHandles.hpp" diff --git a/src/hotspot/share/classfile/packageEntry.cpp b/src/hotspot/share/classfile/packageEntry.cpp index 26af9a4936c1f..9a21578630fbf 100644 --- a/src/hotspot/share/classfile/packageEntry.cpp +++ b/src/hotspot/share/classfile/packageEntry.cpp @@ -34,8 +34,8 @@ #include "memory/resourceArea.hpp" #include "oops/array.hpp" #include "oops/symbol.hpp" -#include "runtime/java.hpp" #include "runtime/handles.inline.hpp" +#include "runtime/java.hpp" #include "utilities/events.hpp" #include "utilities/growableArray.hpp" #include "utilities/ostream.hpp" diff --git a/src/hotspot/share/classfile/packageEntry.hpp b/src/hotspot/share/classfile/packageEntry.hpp index 039c7f21fa63c..aa572dc15b24d 100644 --- a/src/hotspot/share/classfile/packageEntry.hpp +++ b/src/hotspot/share/classfile/packageEntry.hpp @@ -30,9 +30,9 @@ #include "oops/symbolHandle.hpp" #include "runtime/atomic.hpp" #include "utilities/growableArray.hpp" -#include "utilities/resourceHash.hpp" #include "utilities/macros.hpp" #include "utilities/ostream.hpp" +#include "utilities/resourceHash.hpp" #if INCLUDE_JFR #include "jfr/support/jfrTraceIdExtension.hpp" #endif diff --git a/src/hotspot/share/classfile/placeholders.cpp b/src/hotspot/share/classfile/placeholders.cpp index 6ee421fa023e9..b2f1ed40106d6 100644 --- a/src/hotspot/share/classfile/placeholders.cpp +++ b/src/hotspot/share/classfile/placeholders.cpp @@ -25,8 +25,8 @@ #include "classfile/classLoaderData.inline.hpp" #include "classfile/placeholders.hpp" #include "logging/log.hpp" -#include "logging/logTag.hpp" #include "logging/logStream.hpp" +#include "logging/logTag.hpp" #include "memory/resourceArea.hpp" #include "oops/symbolHandle.hpp" #include "runtime/javaThread.hpp" diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp index c3623dc25a1af..d11e688d83c83 100644 --- a/src/hotspot/share/classfile/systemDictionary.cpp +++ b/src/hotspot/share/classfile/systemDictionary.cpp @@ -59,8 +59,8 @@ #include "oops/method.inline.hpp" #include "oops/objArrayKlass.hpp" #include "oops/objArrayOop.inline.hpp" -#include "oops/oop.inline.hpp" #include "oops/oop.hpp" +#include "oops/oop.inline.hpp" #include "oops/oopHandle.hpp" #include "oops/oopHandle.inline.hpp" #include "oops/symbol.hpp" diff --git a/src/hotspot/share/classfile/systemDictionaryShared.cpp b/src/hotspot/share/classfile/systemDictionaryShared.cpp index f863347c1529a..2d56cf12dd376 100644 --- a/src/hotspot/share/classfile/systemDictionaryShared.cpp +++ b/src/hotspot/share/classfile/systemDictionaryShared.cpp @@ -35,8 +35,8 @@ #include "cds/dynamicArchive.hpp" #include "cds/filemap.hpp" #include "cds/heapShared.hpp" -#include "cds/lambdaProxyClassDictionary.hpp" #include "cds/lambdaFormInvokers.inline.hpp" +#include "cds/lambdaProxyClassDictionary.hpp" #include "cds/metaspaceShared.hpp" #include "cds/runTimeClassInfo.hpp" #include "cds/unregisteredClasses.hpp" diff --git a/src/hotspot/share/classfile/systemDictionaryShared.hpp b/src/hotspot/share/classfile/systemDictionaryShared.hpp index 4343bd5f0e892..5f6dd055fd6ef 100644 --- a/src/hotspot/share/classfile/systemDictionaryShared.hpp +++ b/src/hotspot/share/classfile/systemDictionaryShared.hpp @@ -26,8 +26,8 @@ #define SHARE_CLASSFILE_SYSTEMDICTIONARYSHARED_HPP #include "cds/cds_globals.hpp" -#include "cds/filemap.hpp" #include "cds/dumpTimeClassInfo.hpp" +#include "cds/filemap.hpp" #include "cds/runTimeClassInfo.hpp" #include "classfile/classLoaderData.hpp" #include "classfile/packageEntry.hpp" diff --git a/src/hotspot/share/classfile/verifier.cpp b/src/hotspot/share/classfile/verifier.cpp index 0f1468f0309fc..4c0a40b837dfa 100644 --- a/src/hotspot/share/classfile/verifier.cpp +++ b/src/hotspot/share/classfile/verifier.cpp @@ -26,8 +26,8 @@ #include "classfile/classFileStream.hpp" #include "classfile/classLoader.hpp" #include "classfile/javaClasses.hpp" -#include "classfile/stackMapTable.hpp" #include "classfile/stackMapFrame.hpp" +#include "classfile/stackMapTable.hpp" #include "classfile/stackMapTableFormat.hpp" #include "classfile/symbolTable.hpp" #include "classfile/systemDictionary.hpp" diff --git a/src/hotspot/share/classfile/vmIntrinsics.cpp b/src/hotspot/share/classfile/vmIntrinsics.cpp index dd28e1a898cd4..1145310da4607 100644 --- a/src/hotspot/share/classfile/vmIntrinsics.cpp +++ b/src/hotspot/share/classfile/vmIntrinsics.cpp @@ -27,12 +27,12 @@ #include "compiler/compilerDirectives.hpp" #include "jvm_constants.h" #include "jvm_io.h" -#ifdef COMPILER2 -#include "opto/c2_globals.hpp" -#endif #include "runtime/vm_version.hpp" #include "utilities/checkedCast.hpp" #include "utilities/tribool.hpp" +#ifdef COMPILER2 +#include "opto/c2_globals.hpp" +#endif // These are flag-matching functions: inline bool match_F_R(u2 flags) { diff --git a/src/hotspot/share/classfile/vmIntrinsics.hpp b/src/hotspot/share/classfile/vmIntrinsics.hpp index 6699d99e95b94..cdd774f7e30ca 100644 --- a/src/hotspot/share/classfile/vmIntrinsics.hpp +++ b/src/hotspot/share/classfile/vmIntrinsics.hpp @@ -27,8 +27,8 @@ #include "jfr/support/jfrIntrinsics.hpp" #include "memory/allStatic.hpp" -#include "utilities/globalDefinitions.hpp" #include "utilities/enumIterator.hpp" +#include "utilities/globalDefinitions.hpp" #include "utilities/vmEnums.hpp" class Method; diff --git a/src/hotspot/share/classfile/vmSymbols.cpp b/src/hotspot/share/classfile/vmSymbols.cpp index 3dfeebf7ea1fd..bd32eac4f341b 100644 --- a/src/hotspot/share/classfile/vmSymbols.cpp +++ b/src/hotspot/share/classfile/vmSymbols.cpp @@ -29,8 +29,8 @@ #include "compiler/compilerDirectives.hpp" #include "jvm.h" #include "memory/allocation.inline.hpp" -#include "memory/oopFactory.hpp" #include "memory/metaspaceClosure.hpp" +#include "memory/oopFactory.hpp" #include "oops/oop.inline.hpp" #include "runtime/handles.inline.hpp" #include "runtime/signature.hpp" diff --git a/src/hotspot/share/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp index 5c50ec46dfa6e..06f27f09c5c01 100644 --- a/src/hotspot/share/classfile/vmSymbols.hpp +++ b/src/hotspot/share/classfile/vmSymbols.hpp @@ -29,8 +29,8 @@ #include "jvmci/vmSymbols_jvmci.hpp" #include "memory/iterator.hpp" #include "oops/symbol.hpp" -#include "utilities/macros.hpp" #include "utilities/enumIterator.hpp" +#include "utilities/macros.hpp" class SerializeClosure; diff --git a/test/hotspot/jtreg/sources/TestIncludesAreSorted.java b/test/hotspot/jtreg/sources/TestIncludesAreSorted.java index 263eb9b36d91e..5b3280b312fab 100644 --- a/test/hotspot/jtreg/sources/TestIncludesAreSorted.java +++ b/test/hotspot/jtreg/sources/TestIncludesAreSorted.java @@ -47,6 +47,7 @@ public class TestIncludesAreSorted { "share/c1", "share/cds", "share/ci", + "share/classfile", "share/compiler", "share/jvmci", "share/libadt", From 3477cbce67776546bbb0cbc0cf18302a6dab2c97 Mon Sep 17 00:00:00 2001 From: Francesco Andreuzzi Date: Fri, 1 Aug 2025 12:57:51 +0000 Subject: [PATCH 2/2] remove redundant includes --- src/hotspot/share/classfile/javaClasses.cpp | 1 - src/hotspot/share/classfile/klassFactory.cpp | 1 - src/hotspot/share/classfile/modules.cpp | 1 - src/hotspot/share/classfile/systemDictionary.cpp | 2 -- src/hotspot/share/classfile/systemDictionaryShared.cpp | 1 - 5 files changed, 6 deletions(-) diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp index 41a2a17579af0..a092417446c66 100644 --- a/src/hotspot/share/classfile/javaClasses.cpp +++ b/src/hotspot/share/classfile/javaClasses.cpp @@ -55,7 +55,6 @@ #include "oops/fieldStreams.inline.hpp" #include "oops/instanceKlass.inline.hpp" #include "oops/instanceMirrorKlass.hpp" -#include "oops/klass.hpp" #include "oops/klass.inline.hpp" #include "oops/method.inline.hpp" #include "oops/objArrayKlass.hpp" diff --git a/src/hotspot/share/classfile/klassFactory.cpp b/src/hotspot/share/classfile/klassFactory.cpp index f2f31de4a3799..5dd2cd2385b2b 100644 --- a/src/hotspot/share/classfile/klassFactory.cpp +++ b/src/hotspot/share/classfile/klassFactory.cpp @@ -27,7 +27,6 @@ #include "classfile/classFileParser.hpp" #include "classfile/classFileStream.hpp" #include "classfile/classLoader.hpp" -#include "classfile/classLoaderData.hpp" #include "classfile/classLoaderData.inline.hpp" #include "classfile/classLoadInfo.hpp" #include "classfile/klassFactory.hpp" diff --git a/src/hotspot/share/classfile/modules.cpp b/src/hotspot/share/classfile/modules.cpp index c7b5a72945106..132c1c4ca497e 100644 --- a/src/hotspot/share/classfile/modules.cpp +++ b/src/hotspot/share/classfile/modules.cpp @@ -31,7 +31,6 @@ #include "classfile/classLoaderData.inline.hpp" #include "classfile/classLoaderDataShared.hpp" #include "classfile/javaAssertions.hpp" -#include "classfile/javaClasses.hpp" #include "classfile/javaClasses.inline.hpp" #include "classfile/moduleEntry.hpp" #include "classfile/modules.hpp" diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp index d11e688d83c83..f482a5bb3035f 100644 --- a/src/hotspot/share/classfile/systemDictionary.cpp +++ b/src/hotspot/share/classfile/systemDictionary.cpp @@ -59,9 +59,7 @@ #include "oops/method.inline.hpp" #include "oops/objArrayKlass.hpp" #include "oops/objArrayOop.inline.hpp" -#include "oops/oop.hpp" #include "oops/oop.inline.hpp" -#include "oops/oopHandle.hpp" #include "oops/oopHandle.inline.hpp" #include "oops/symbol.hpp" #include "oops/typeArrayKlass.hpp" diff --git a/src/hotspot/share/classfile/systemDictionaryShared.cpp b/src/hotspot/share/classfile/systemDictionaryShared.cpp index 2d56cf12dd376..7dd3a7d1bb275 100644 --- a/src/hotspot/share/classfile/systemDictionaryShared.cpp +++ b/src/hotspot/share/classfile/systemDictionaryShared.cpp @@ -45,7 +45,6 @@ #include "classfile/classLoaderData.inline.hpp" #include "classfile/classLoaderDataGraph.hpp" #include "classfile/dictionary.hpp" -#include "classfile/javaClasses.hpp" #include "classfile/javaClasses.inline.hpp" #include "classfile/symbolTable.hpp" #include "classfile/systemDictionary.hpp"