8364359: Sort share/cds includes

Reviewed-by: shade, iklam

src/hotspot/share/cds/aotClassLocation.cpp

@@ -45,8 +45,8 @@
 #include "utilities/formatBuffer.hpp"
 #include "utilities/stringUtils.hpp"
 
-#include <sys/stat.h>
 #include <errno.h>
+#include <sys/stat.h>
 
 Array<ClassPathZipEntry*>* AOTClassLocationConfig::_dumptime_jar_files = nullptr;
 AOTClassLocationConfig* AOTClassLocationConfig::_dumptime_instance = nullptr;

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"
 

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"

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"

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;

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"

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"

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"

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"

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 <sys/stat.h>
-# include <errno.h>
+#include <errno.h>
+#include <sys/stat.h>
 
 #ifndef O_BINARY       // if defined (Win32) use binary files.
 #define O_BINARY 0     // otherwise do nothing.

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) {

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"

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",