8365975: Sort share/memory includes

Reviewed-by: shade, ayang, jwaters

src/hotspot/share/memory/allocation.cpp

@@ -22,7 +22,6 @@
  *
  */
 
-#include "memory/allocation.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/arena.hpp"
 #include "memory/metaspace.hpp"

src/hotspot/share/memory/arena.cpp

@@ -24,7 +24,6 @@
  */
 
 #include "compiler/compilationMemoryStatistic.hpp"
-#include "memory/allocation.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/arena.hpp"
 #include "memory/resourceArea.hpp"

src/hotspot/share/memory/classLoaderMetaspace.cpp

@@ -26,7 +26,6 @@
 #include "logging/log.hpp"
 #include "memory/classLoaderMetaspace.hpp"
 #include "memory/metaspace.hpp"
-#include "memory/metaspaceUtils.hpp"
 #include "memory/metaspace/chunkManager.hpp"
 #include "memory/metaspace/internalStats.hpp"
 #include "memory/metaspace/metablock.hpp"
@@ -38,6 +37,7 @@
 #include "memory/metaspace/metaspaceStatistics.hpp"
 #include "memory/metaspace/runningCounters.hpp"
 #include "memory/metaspaceTracer.hpp"
+#include "memory/metaspaceUtils.hpp"
 #include "oops/klass.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "utilities/debug.hpp"

src/hotspot/share/memory/heapInspection.hpp

@@ -27,9 +27,9 @@
 
 #include "gc/shared/workerThread.hpp"
 #include "memory/allocation.hpp"
+#include "oops/annotations.hpp"
 #include "oops/objArrayOop.hpp"
 #include "oops/oop.hpp"
-#include "oops/annotations.hpp"
 #include "utilities/macros.hpp"
 
 class ParallelObjectIterator;

src/hotspot/share/memory/iterator.inline.hpp

@@ -32,12 +32,12 @@
 #include "code/nmethod.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
-#include "oops/klass.hpp"
+#include "oops/instanceClassLoaderKlass.inline.hpp"
 #include "oops/instanceKlass.inline.hpp"
 #include "oops/instanceMirrorKlass.inline.hpp"
-#include "oops/instanceClassLoaderKlass.inline.hpp"
 #include "oops/instanceRefKlass.inline.hpp"
 #include "oops/instanceStackChunkKlass.inline.hpp"
+#include "oops/klass.hpp"
 #include "oops/objArrayKlass.inline.hpp"
 #include "oops/typeArrayKlass.inline.hpp"
 #include "utilities/debug.hpp"

src/hotspot/share/memory/memRegion.cpp

@@ -22,7 +22,6 @@
  *
  */
 
-#include "memory/allocation.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/memRegion.hpp"
 #include "runtime/globals.hpp"

src/hotspot/share/memory/metadataFactory.hpp

@@ -30,6 +30,7 @@
 #include "oops/array.inline.hpp"
 #include "utilities/exceptions.hpp"
 #include "utilities/globalDefinitions.hpp"
+
 #include <type_traits>
 
 class MetadataFactory : AllStatic {

src/hotspot/share/memory/metaspace/blockTree.cpp

@@ -23,8 +23,8 @@
  *
  */
 
-#include "memory/metaspace/chunklevel.hpp"
 #include "memory/metaspace/blockTree.hpp"
+#include "memory/metaspace/chunklevel.hpp"
 #include "memory/resourceArea.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"

src/hotspot/share/memory/metaspace/metablock.inline.hpp

@@ -27,10 +27,11 @@
 #define SHARE_MEMORY_METASPACE_METABLOCK_INLINE_HPP
 
 #include "memory/metaspace/metablock.hpp"
-#include "utilities/globalDefinitions.hpp"
+
 #include "utilities/align.hpp"
-#include "utilities/ostream.hpp"
 #include "utilities/debug.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/ostream.hpp"
 
 class outputStream;
 

src/hotspot/share/memory/metaspace/virtualSpaceList.cpp

@@ -29,8 +29,8 @@
 #include "memory/metaspace/commitLimiter.hpp"
 #include "memory/metaspace/counters.hpp"
 #include "memory/metaspace/freeChunkList.hpp"
-#include "memory/metaspace/metaspaceContext.hpp"
 #include "memory/metaspace/metaspaceCommon.hpp"
+#include "memory/metaspace/metaspaceContext.hpp"
 #include "memory/metaspace/virtualSpaceList.hpp"
 #include "memory/metaspace/virtualSpaceNode.hpp"
 #include "runtime/atomic.hpp"

src/hotspot/share/memory/metaspaceClosure.hpp

@@ -34,6 +34,7 @@
 #include "utilities/growableArray.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/resizableHashTable.hpp"
+
 #include <type_traits>
 
 // The metadata hierarchy is separate from the oop hierarchy

src/hotspot/share/memory/resourceArea.inline.hpp

@@ -26,6 +26,7 @@
 #define SHARE_MEMORY_RESOURCEAREA_INLINE_HPP
 
 #include "memory/resourceArea.hpp"
+
 #include "nmt/memTracker.hpp"
 
 inline char* ResourceArea::allocate_bytes(size_t size, AllocFailType alloc_failmode) {

test/hotspot/jtreg/sources/TestIncludesAreSorted.java

@@ -55,6 +55,7 @@ public class TestIncludesAreSorted {
                     "share/jvmci",
                     "share/libadt",
                     "share/logging",
+                    "share/memory",
                     "share/metaprogramming",
                     "share/oops",
                     "share/opto",