From c9b8bd6ff478fda23a10a6d3e04aec4478cb9ff6 Mon Sep 17 00:00:00 2001 From: Francesco Andreuzzi Date: Fri, 1 Aug 2025 06:27:02 +0000 Subject: [PATCH] 8364359: Sort share/cds includes Reviewed-by: shade, iklam --- src/hotspot/share/cds/aotClassLocation.cpp | 2 +- src/hotspot/share/cds/aotClassLocation.hpp | 2 +- src/hotspot/share/cds/aotConstantPoolResolver.hpp | 2 +- src/hotspot/share/cds/aotLinkedClassBulkLoader.hpp | 2 +- src/hotspot/share/cds/archiveUtils.hpp | 4 ++-- src/hotspot/share/cds/cdsEnumKlass.cpp | 2 +- src/hotspot/share/cds/cppVtables.cpp | 4 ++-- src/hotspot/share/cds/dumpTimeClassInfo.inline.hpp | 2 +- src/hotspot/share/cds/dynamicArchive.cpp | 2 +- src/hotspot/share/cds/filemap.cpp | 6 +++--- src/hotspot/share/cds/lambdaFormInvokers.inline.hpp | 1 + src/hotspot/share/cds/metaspaceShared.cpp | 2 +- test/hotspot/jtreg/sources/TestIncludesAreSorted.java | 1 + 13 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/hotspot/share/cds/aotClassLocation.cpp b/src/hotspot/share/cds/aotClassLocation.cpp index b662c5a1b47..4119b9236e1 100644 --- a/src/hotspot/share/cds/aotClassLocation.cpp +++ b/src/hotspot/share/cds/aotClassLocation.cpp @@ -45,8 +45,8 @@ #include "utilities/formatBuffer.hpp" #include "utilities/stringUtils.hpp" -#include #include +#include Array* AOTClassLocationConfig::_dumptime_jar_files = nullptr; AOTClassLocationConfig* AOTClassLocationConfig::_dumptime_instance = nullptr; diff --git a/src/hotspot/share/cds/aotClassLocation.hpp b/src/hotspot/share/cds/aotClassLocation.hpp index 460788930a4..89a5e6bc939 100644 --- a/src/hotspot/share/cds/aotClassLocation.hpp +++ b/src/hotspot/share/cds/aotClassLocation.hpp @@ -28,8 +28,8 @@ #include "memory/allocation.hpp" #include "oops/array.hpp" #include "utilities/exceptions.hpp" -#include "utilities/growableArray.hpp" #include "utilities/globalDefinitions.hpp" +#include "utilities/growableArray.hpp" #include "utilities/macros.hpp" #include "utilities/ostream.hpp" diff --git a/src/hotspot/share/cds/aotConstantPoolResolver.hpp b/src/hotspot/share/cds/aotConstantPoolResolver.hpp index 89d9d5c2476..bab9e263a22 100644 --- a/src/hotspot/share/cds/aotConstantPoolResolver.hpp +++ b/src/hotspot/share/cds/aotConstantPoolResolver.hpp @@ -26,8 +26,8 @@ #define SHARE_CDS_AOTCONSTANTPOOLRESOLVER_HPP #include "interpreter/bytecodes.hpp" -#include "memory/allStatic.hpp" #include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "oops/oopsHierarchy.hpp" #include "runtime/handles.hpp" #include "utilities/exceptions.hpp" diff --git a/src/hotspot/share/cds/aotLinkedClassBulkLoader.hpp b/src/hotspot/share/cds/aotLinkedClassBulkLoader.hpp index 86fb5017eb8..0a8b0c4d537 100644 --- a/src/hotspot/share/cds/aotLinkedClassBulkLoader.hpp +++ b/src/hotspot/share/cds/aotLinkedClassBulkLoader.hpp @@ -25,8 +25,8 @@ #ifndef SHARE_CDS_AOTLINKEDCLASSBULKLOADER_HPP #define SHARE_CDS_AOTLINKEDCLASSBULKLOADER_HPP -#include "memory/allStatic.hpp" #include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "runtime/handles.hpp" #include "utilities/exceptions.hpp" #include "utilities/macros.hpp" diff --git a/src/hotspot/share/cds/archiveUtils.hpp b/src/hotspot/share/cds/archiveUtils.hpp index 93e84694c35..8fce6e31bb1 100644 --- a/src/hotspot/share/cds/archiveUtils.hpp +++ b/src/hotspot/share/cds/archiveUtils.hpp @@ -30,11 +30,11 @@ #include "logging/log.hpp" #include "memory/metaspace.hpp" #include "memory/virtualspace.hpp" +#include "runtime/nonJavaThread.hpp" +#include "runtime/semaphore.hpp" #include "utilities/bitMap.hpp" #include "utilities/exceptions.hpp" #include "utilities/macros.hpp" -#include "runtime/nonJavaThread.hpp" -#include "runtime/semaphore.hpp" class BootstrapInfo; class ReservedSpace; diff --git a/src/hotspot/share/cds/cdsEnumKlass.cpp b/src/hotspot/share/cds/cdsEnumKlass.cpp index fe55c904312..e46a7eb84f4 100644 --- a/src/hotspot/share/cds/cdsEnumKlass.cpp +++ b/src/hotspot/share/cds/cdsEnumKlass.cpp @@ -25,8 +25,8 @@ #include "cds/archiveHeapLoader.hpp" #include "cds/cdsEnumKlass.hpp" #include "cds/heapShared.hpp" -#include "classfile/vmClasses.hpp" #include "classfile/systemDictionaryShared.hpp" +#include "classfile/vmClasses.hpp" #include "memory/resourceArea.hpp" #include "oops/fieldStreams.inline.hpp" #include "oops/oop.inline.hpp" diff --git a/src/hotspot/share/cds/cppVtables.cpp b/src/hotspot/share/cds/cppVtables.cpp index fe8b8d917be..319e4f6e95f 100644 --- a/src/hotspot/share/cds/cppVtables.cpp +++ b/src/hotspot/share/cds/cppVtables.cpp @@ -22,8 +22,8 @@ * */ -#include "cds/archiveUtils.hpp" #include "cds/archiveBuilder.hpp" +#include "cds/archiveUtils.hpp" #include "cds/cdsConfig.hpp" #include "cds/cppVtables.hpp" #include "cds/metaspaceShared.hpp" @@ -34,8 +34,8 @@ #include "oops/instanceStackChunkKlass.hpp" #include "oops/methodCounters.hpp" #include "oops/methodData.hpp" -#include "oops/trainingData.hpp" #include "oops/objArrayKlass.hpp" +#include "oops/trainingData.hpp" #include "oops/typeArrayKlass.hpp" #include "runtime/arguments.hpp" #include "utilities/globalDefinitions.hpp" diff --git a/src/hotspot/share/cds/dumpTimeClassInfo.inline.hpp b/src/hotspot/share/cds/dumpTimeClassInfo.inline.hpp index 2d1f57175a0..90f35c61de1 100644 --- a/src/hotspot/share/cds/dumpTimeClassInfo.inline.hpp +++ b/src/hotspot/share/cds/dumpTimeClassInfo.inline.hpp @@ -29,8 +29,8 @@ #include "cds/dumpTimeClassInfo.hpp" #include "cds/cdsConfig.hpp" -#include "classfile/systemDictionaryShared.hpp" #include "classfile/classLoaderData.inline.hpp" +#include "classfile/systemDictionaryShared.hpp" #include "oops/instanceKlass.hpp" #include "oops/klass.inline.hpp" #include "runtime/safepoint.hpp" diff --git a/src/hotspot/share/cds/dynamicArchive.cpp b/src/hotspot/share/cds/dynamicArchive.cpp index 36afbc65ce3..397f9146afb 100644 --- a/src/hotspot/share/cds/dynamicArchive.cpp +++ b/src/hotspot/share/cds/dynamicArchive.cpp @@ -42,8 +42,8 @@ #include "classfile/systemDictionaryShared.hpp" #include "classfile/vmSymbols.hpp" #include "gc/shared/collectedHeap.hpp" -#include "gc/shared/gcVMOperations.hpp" #include "gc/shared/gc_globals.hpp" +#include "gc/shared/gcVMOperations.hpp" #include "jvm.h" #include "logging/log.hpp" #include "memory/metaspaceClosure.hpp" diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp index 82a4ae7d9ba..a2b9e83ee68 100644 --- a/src/hotspot/share/cds/filemap.cpp +++ b/src/hotspot/share/cds/filemap.cpp @@ -55,9 +55,9 @@ #include "memory/universe.hpp" #include "nmt/memTracker.hpp" #include "oops/access.hpp" +#include "oops/compressedKlass.hpp" #include "oops/compressedOops.hpp" #include "oops/compressedOops.inline.hpp" -#include "oops/compressedKlass.hpp" #include "oops/objArrayOop.hpp" #include "oops/oop.inline.hpp" #include "oops/trainingData.hpp" @@ -80,8 +80,8 @@ #include "gc/g1/g1HeapRegion.hpp" #endif -# include -# include +#include +#include #ifndef O_BINARY // if defined (Win32) use binary files. #define O_BINARY 0 // otherwise do nothing. diff --git a/src/hotspot/share/cds/lambdaFormInvokers.inline.hpp b/src/hotspot/share/cds/lambdaFormInvokers.inline.hpp index dddd0e36c47..09034debc13 100644 --- a/src/hotspot/share/cds/lambdaFormInvokers.inline.hpp +++ b/src/hotspot/share/cds/lambdaFormInvokers.inline.hpp @@ -26,6 +26,7 @@ #define SHARE_CDS_LAMBDAFORMINVOKERS_INLINE_HPP #include "cds/lambdaFormInvokers.hpp" + #include "classfile/vmSymbols.hpp" inline bool LambdaFormInvokers::may_be_regenerated_class(Symbol* name) { diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp index 8db2195c434..a907a69faac 100644 --- a/src/hotspot/share/cds/metaspaceShared.cpp +++ b/src/hotspot/share/cds/metaspaceShared.cpp @@ -62,8 +62,8 @@ #include "code/aotCodeCache.hpp" #include "code/codeCache.hpp" #include "gc/shared/gcVMOperations.hpp" -#include "interpreter/bytecodeStream.hpp" #include "interpreter/bytecodes.hpp" +#include "interpreter/bytecodeStream.hpp" #include "jvm_io.h" #include "logging/log.hpp" #include "logging/logMessage.hpp" diff --git a/test/hotspot/jtreg/sources/TestIncludesAreSorted.java b/test/hotspot/jtreg/sources/TestIncludesAreSorted.java index e978dfcc8c5..263eb9b36d9 100644 --- a/test/hotspot/jtreg/sources/TestIncludesAreSorted.java +++ b/test/hotspot/jtreg/sources/TestIncludesAreSorted.java @@ -45,6 +45,7 @@ public class TestIncludesAreSorted { private static final String[] HOTSPOT_SOURCES_TO_CHECK = { "share/adlc", "share/c1", + "share/cds", "share/ci", "share/compiler", "share/jvmci",