From e307b5cca870f7ea9b79b7a9d4e6f7f762c27aa4 Mon Sep 17 00:00:00 2001
From: Francesco Andreuzzi <andreuzzi.francesco@gmail.com>
Date: Mon, 28 Jul 2025 05:17:52 +0000
Subject: [PATCH] 8363584: Sort share/utilities includes

Reviewed-by: kbarrett, dholmes, shade
---
 src/hotspot/share/utilities/align.hpp         |  1 +
 .../concurrentHashTableTasks.inline.hpp       |  2 +-
 src/hotspot/share/utilities/copy.cpp          |  1 -
 src/hotspot/share/utilities/debug.cpp         |  2 +-
 src/hotspot/share/utilities/elfFile.cpp       |  4 +--
 src/hotspot/share/utilities/elfFile.hpp       |  2 +-
 src/hotspot/share/utilities/exceptions.cpp    |  2 +-
 .../share/utilities/fakeRttiSupport.hpp       |  2 +-
 .../share/utilities/globalDefinitions.hpp     |  5 ++--
 .../share/utilities/globalDefinitions_gcc.hpp | 18 +++++-------
 .../utilities/globalDefinitions_visCPP.hpp    | 29 ++++++++++---------
 src/hotspot/share/utilities/intpow.hpp        |  1 +
 src/hotspot/share/utilities/json.cpp          |  1 +
 src/hotspot/share/utilities/ostream.cpp       |  8 ++---
 src/hotspot/share/utilities/packedTable.cpp   |  4 +--
 src/hotspot/share/utilities/powerOfTwo.hpp    |  1 +
 src/hotspot/share/utilities/rbTree.hpp        |  1 +
 src/hotspot/share/utilities/rbTree.inline.hpp |  3 +-
 .../utilities/singleWriterSynchronizer.cpp    |  2 +-
 src/hotspot/share/utilities/utf8.cpp          |  2 +-
 src/hotspot/share/utilities/vmError.cpp       |  2 +-
 .../share/utilities/waitBarrier_generic.cpp   |  2 +-
 src/hotspot/share/utilities/xmlstream.cpp     |  2 +-
 .../jtreg/sources/TestIncludesAreSorted.java  |  3 +-
 24 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/src/hotspot/share/utilities/align.hpp b/src/hotspot/share/utilities/align.hpp
index 69dd1a3052b..ef57d6f5edd 100644
--- a/src/hotspot/share/utilities/align.hpp
+++ b/src/hotspot/share/utilities/align.hpp
@@ -30,6 +30,7 @@
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/powerOfTwo.hpp"
+
 #include <type_traits>
 
 // Compute mask to use for aligning to or testing alignment.
diff --git a/src/hotspot/share/utilities/concurrentHashTableTasks.inline.hpp b/src/hotspot/share/utilities/concurrentHashTableTasks.inline.hpp
index f9808ba6c9c..ce4a7298ca5 100644
--- a/src/hotspot/share/utilities/concurrentHashTableTasks.inline.hpp
+++ b/src/hotspot/share/utilities/concurrentHashTableTasks.inline.hpp
@@ -28,8 +28,8 @@
 // No concurrentHashTableTasks.hpp
 
 #include "runtime/atomic.hpp"
-#include "utilities/globalDefinitions.hpp"
 #include "utilities/concurrentHashTable.inline.hpp"
+#include "utilities/globalDefinitions.hpp"
 
 // This inline file contains BulkDeleteTask and GrowTasks which are both bucket
 // operations, which they are serialized with each other.
diff --git a/src/hotspot/share/utilities/copy.cpp b/src/hotspot/share/utilities/copy.cpp
index 8158696532a..4dc1ef7b5bf 100644
--- a/src/hotspot/share/utilities/copy.cpp
+++ b/src/hotspot/share/utilities/copy.cpp
@@ -22,7 +22,6 @@
  *
  */
 
-#include "utilities/copy.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "utilities/align.hpp"
 #include "utilities/byteswap.hpp"
diff --git a/src/hotspot/share/utilities/debug.cpp b/src/hotspot/share/utilities/debug.cpp
index 2502f850b66..2865dbc5991 100644
--- a/src/hotspot/share/utilities/debug.cpp
+++ b/src/hotspot/share/utilities/debug.cpp
@@ -63,8 +63,8 @@
 #include "utilities/unsigned5.hpp"
 #include "utilities/vmError.hpp"
 
-#include <stdio.h>
 #include <stdarg.h>
+#include <stdio.h>
 
 // These functions needs to be exported on Windows only
 #define DEBUGEXPORT WINDOWS_ONLY(JNIEXPORT)
diff --git a/src/hotspot/share/utilities/elfFile.cpp b/src/hotspot/share/utilities/elfFile.cpp
index f2ddbe164f6..e3cbb5ac18e 100644
--- a/src/hotspot/share/utilities/elfFile.cpp
+++ b/src/hotspot/share/utilities/elfFile.cpp
@@ -36,10 +36,10 @@
 #include "utilities/elfSymbolTable.hpp"
 #include "utilities/ostream.hpp"
 
-#include <string.h>
-#include <stdio.h>
 #include <limits.h>
 #include <new>
+#include <stdio.h>
+#include <string.h>
 
 const char* ElfFile::USR_LIB_DEBUG_DIRECTORY = "/usr/lib/debug";
 
diff --git a/src/hotspot/share/utilities/elfFile.hpp b/src/hotspot/share/utilities/elfFile.hpp
index 0caafc7645e..979fac5edfc 100644
--- a/src/hotspot/share/utilities/elfFile.hpp
+++ b/src/hotspot/share/utilities/elfFile.hpp
@@ -67,8 +67,8 @@ typedef Elf32_Sym       Elf_Sym;
 #endif
 #endif
 
-#include "jvm_md.h"
 #include "globalDefinitions.hpp"
+#include "jvm_md.h"
 #include "memory/allocation.hpp"
 #include "utilities/checkedCast.hpp"
 #include "utilities/decoder.hpp"
diff --git a/src/hotspot/share/utilities/exceptions.cpp b/src/hotspot/share/utilities/exceptions.cpp
index fd1a2930034..2ee2132ebbd 100644
--- a/src/hotspot/share/utilities/exceptions.cpp
+++ b/src/hotspot/share/utilities/exceptions.cpp
@@ -32,13 +32,13 @@
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/init.hpp"
 #include "runtime/java.hpp"
 #include "runtime/javaCalls.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/os.hpp"
-#include "runtime/atomic.hpp"
 #include "utilities/events.hpp"
 #include "utilities/exceptions.hpp"
 #include "utilities/utf8.hpp"
diff --git a/src/hotspot/share/utilities/fakeRttiSupport.hpp b/src/hotspot/share/utilities/fakeRttiSupport.hpp
index 584da814a24..2208900f7ed 100644
--- a/src/hotspot/share/utilities/fakeRttiSupport.hpp
+++ b/src/hotspot/share/utilities/fakeRttiSupport.hpp
@@ -25,8 +25,8 @@
 #ifndef SHARE_UTILITIES_FAKERTTISUPPORT_HPP
 #define SHARE_UTILITIES_FAKERTTISUPPORT_HPP
 
-#include "utilities/globalDefinitions.hpp"
 #include "utilities/debug.hpp"
+#include "utilities/globalDefinitions.hpp"
 
 // Provides support for checked downcasts in a hierarchy of classes.
 // The base class provides a member of this type, specialized on that
diff --git a/src/hotspot/share/utilities/globalDefinitions.hpp b/src/hotspot/share/utilities/globalDefinitions.hpp
index f6d162a81e4..15367e44874 100644
--- a/src/hotspot/share/utilities/globalDefinitions.hpp
+++ b/src/hotspot/share/utilities/globalDefinitions.hpp
@@ -25,14 +25,13 @@
 #ifndef SHARE_UTILITIES_GLOBALDEFINITIONS_HPP
 #define SHARE_UTILITIES_GLOBALDEFINITIONS_HPP
 
+// Get constants like JVM_T_CHAR and JVM_SIGNATURE_INT, before pulling in <jvm.h>.
+#include "classfile_constants.h"
 #include "utilities/compilerWarnings.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/forbiddenFunctions.hpp"
 #include "utilities/macros.hpp"
 
-// Get constants like JVM_T_CHAR and JVM_SIGNATURE_INT, before pulling in <jvm.h>.
-#include "classfile_constants.h"
-
 #include COMPILER_HEADER(utilities/globalDefinitions)
 
 #include <cstddef>
diff --git a/src/hotspot/share/utilities/globalDefinitions_gcc.hpp b/src/hotspot/share/utilities/globalDefinitions_gcc.hpp
index 94f37e7954e..41b7868f8c7 100644
--- a/src/hotspot/share/utilities/globalDefinitions_gcc.hpp
+++ b/src/hotspot/share/utilities/globalDefinitions_gcc.hpp
@@ -33,8 +33,13 @@
 
 #include <alloca.h>
 #include <ctype.h>
+#include <dlfcn.h>
+#include <errno.h>
+#include <fcntl.h>
 #include <inttypes.h>
-#include <string.h>
+#include <limits.h>
+#include <math.h>
+#include <pthread.h>
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdint.h>
@@ -48,16 +53,9 @@
   #undef malloc
   extern void *malloc(size_t) asm("vec_malloc");
 #endif
-#include <wchar.h>
-
-#include <math.h>
+#include <string.h>
 #include <time.h>
-#include <fcntl.h>
-#include <dlfcn.h>
-#include <pthread.h>
-
-#include <limits.h>
-#include <errno.h>
+#include <wchar.h>
 
 #if defined(LINUX) || defined(_ALLBSD_SOURCE) || defined(_AIX)
 #include <signal.h>
diff --git a/src/hotspot/share/utilities/globalDefinitions_visCPP.hpp b/src/hotspot/share/utilities/globalDefinitions_visCPP.hpp
index 4b4a0f4d838..536b79165ae 100644
--- a/src/hotspot/share/utilities/globalDefinitions_visCPP.hpp
+++ b/src/hotspot/share/utilities/globalDefinitions_visCPP.hpp
@@ -31,23 +31,24 @@
 // globally used constants & types, class (forward)
 // declarations and a few frequently used utility functions.
 
-# include <ctype.h>
-# include <string.h>
-# include <stdarg.h>
-# include <stdlib.h>
-# include <stdint.h>
-# include <stddef.h>// for offsetof
-# include <sys/stat.h>
-# include <io.h>    // for stream.cpp
-# include <float.h> // for _isnan
-# include <stdio.h> // for va_list
-# include <time.h>
-# include <fcntl.h>
-# include <limits.h>
-# include <inttypes.h>
 // Need this on windows to get the math constants (e.g., M_PI).
 #define _USE_MATH_DEFINES
+
+# include <ctype.h>
+# include <fcntl.h>
+# include <float.h> // for _isnan
+# include <inttypes.h>
+# include <io.h>    // for stream.cpp
+# include <limits.h>
 # include <math.h>
+# include <stdarg.h>
+# include <stddef.h>// for offsetof
+# include <stdint.h>
+# include <stdio.h>
+# include <stdlib.h>
+# include <string.h>
+# include <sys/stat.h>
+# include <time.h>
 
 // Only 64-bit Windows is supported
 #ifndef _LP64
diff --git a/src/hotspot/share/utilities/intpow.hpp b/src/hotspot/share/utilities/intpow.hpp
index 0b441a55c4c..1e767e23ab8 100644
--- a/src/hotspot/share/utilities/intpow.hpp
+++ b/src/hotspot/share/utilities/intpow.hpp
@@ -26,6 +26,7 @@
 #define SHARE_UTILITIES_INTPOW_HPP
 
 #include "metaprogramming/enableIf.hpp"
+
 #include <limits>
 #include <type_traits>
 
diff --git a/src/hotspot/share/utilities/json.cpp b/src/hotspot/share/utilities/json.cpp
index fa8829491d9..5dba5a32d0b 100644
--- a/src/hotspot/share/utilities/json.cpp
+++ b/src/hotspot/share/utilities/json.cpp
@@ -33,6 +33,7 @@
 
 #include "utilities/json.hpp"
 #include "utilities/ostream.hpp"
+
 #include <math.h>
 
 static const char* strchrnul_(const char *s, int c) {
diff --git a/src/hotspot/share/utilities/ostream.cpp b/src/hotspot/share/utilities/ostream.cpp
index f3c469f1486..532e540af9a 100644
--- a/src/hotspot/share/utilities/ostream.cpp
+++ b/src/hotspot/share/utilities/ostream.cpp
@@ -1077,11 +1077,11 @@ bufferedStream::~bufferedStream() {
 #ifndef PRODUCT
 
 #if defined(LINUX) || defined(AIX) || defined(_ALLBSD_SOURCE)
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
 #include <arpa/inet.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <sys/types.h>
 #elif defined(_WINDOWS)
 #include <Ws2tcpip.h>
 #endif
diff --git a/src/hotspot/share/utilities/packedTable.cpp b/src/hotspot/share/utilities/packedTable.cpp
index 134cd2cd751..6deb788b313 100644
--- a/src/hotspot/share/utilities/packedTable.cpp
+++ b/src/hotspot/share/utilities/packedTable.cpp
@@ -21,12 +21,12 @@
  * questions.
  *
  */
-#include <cstring>
-
 #include "utilities/align.hpp"
 #include "utilities/count_leading_zeros.hpp"
 #include "utilities/packedTable.hpp"
 
+#include <cstring>
+
 // The thresholds are inclusive, and in practice the limits are rounded
 // to the nearest power-of-two - 1.
 // Based on the max_key and max_value we figure out the number of bits required to store
diff --git a/src/hotspot/share/utilities/powerOfTwo.hpp b/src/hotspot/share/utilities/powerOfTwo.hpp
index b40c3fb7404..8159fb3af2a 100644
--- a/src/hotspot/share/utilities/powerOfTwo.hpp
+++ b/src/hotspot/share/utilities/powerOfTwo.hpp
@@ -30,6 +30,7 @@
 #include "utilities/count_trailing_zeros.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
+
 #include <limits>
 #include <type_traits>
 
diff --git a/src/hotspot/share/utilities/rbTree.hpp b/src/hotspot/share/utilities/rbTree.hpp
index 04c46c85d2c..761148d1c89 100644
--- a/src/hotspot/share/utilities/rbTree.hpp
+++ b/src/hotspot/share/utilities/rbTree.hpp
@@ -29,6 +29,7 @@
 #include "nmt/memTag.hpp"
 #include "runtime/os.hpp"
 #include "utilities/globalDefinitions.hpp"
+
 #include <type_traits>
 
 // An intrusive red-black tree is constructed with two template parameters:
diff --git a/src/hotspot/share/utilities/rbTree.inline.hpp b/src/hotspot/share/utilities/rbTree.inline.hpp
index c28c2784f6d..1c3fdfb0dd7 100644
--- a/src/hotspot/share/utilities/rbTree.inline.hpp
+++ b/src/hotspot/share/utilities/rbTree.inline.hpp
@@ -25,12 +25,13 @@
 #ifndef SHARE_UTILITIES_RBTREE_INLINE_HPP
 #define SHARE_UTILITIES_RBTREE_INLINE_HPP
 
+#include "utilities/rbTree.hpp"
+
 #include "metaprogramming/enableIf.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/ostream.hpp"
 #include "utilities/powerOfTwo.hpp"
-#include "utilities/rbTree.hpp"
 
 inline void IntrusiveRBNode::replace_child(IntrusiveRBNode* old_child, IntrusiveRBNode* new_child) {
   if (_left == old_child) {
diff --git a/src/hotspot/share/utilities/singleWriterSynchronizer.cpp b/src/hotspot/share/utilities/singleWriterSynchronizer.cpp
index c63cac4faf7..58f0e245780 100644
--- a/src/hotspot/share/utilities/singleWriterSynchronizer.cpp
+++ b/src/hotspot/share/utilities/singleWriterSynchronizer.cpp
@@ -26,8 +26,8 @@
 #include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
 #include "utilities/debug.hpp"
-#include "utilities/singleWriterSynchronizer.hpp"
 #include "utilities/macros.hpp"
+#include "utilities/singleWriterSynchronizer.hpp"
 
 SingleWriterSynchronizer::SingleWriterSynchronizer() :
   _enter(0),
diff --git a/src/hotspot/share/utilities/utf8.cpp b/src/hotspot/share/utilities/utf8.cpp
index 698ee557202..4b8b3760065 100644
--- a/src/hotspot/share/utilities/utf8.cpp
+++ b/src/hotspot/share/utilities/utf8.cpp
@@ -23,11 +23,11 @@
  */
 
 #include "memory/allocation.hpp"
+#include "runtime/os.hpp"
 #include "utilities/checkedCast.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/utf8.hpp"
-#include "runtime/os.hpp"
 
 // Assume the utf8 string is in legal form and has been
 // checked in the class file parser/format checker.
diff --git a/src/hotspot/share/utilities/vmError.cpp b/src/hotspot/share/utilities/vmError.cpp
index 448df20c44e..8c85e595336 100644
--- a/src/hotspot/share/utilities/vmError.cpp
+++ b/src/hotspot/share/utilities/vmError.cpp
@@ -57,9 +57,9 @@
 #include "runtime/threads.hpp"
 #include "runtime/threadSMR.hpp"
 #include "runtime/trimNativeHeap.hpp"
+#include "runtime/vm_version.hpp"
 #include "runtime/vmOperations.hpp"
 #include "runtime/vmThread.hpp"
-#include "runtime/vm_version.hpp"
 #include "sanitizers/ub.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/decoder.hpp"
diff --git a/src/hotspot/share/utilities/waitBarrier_generic.cpp b/src/hotspot/share/utilities/waitBarrier_generic.cpp
index e09a2d5282b..efaa49b24a9 100644
--- a/src/hotspot/share/utilities/waitBarrier_generic.cpp
+++ b/src/hotspot/share/utilities/waitBarrier_generic.cpp
@@ -26,8 +26,8 @@
 #include "runtime/atomic.hpp"
 #include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
-#include "utilities/waitBarrier_generic.hpp"
 #include "utilities/spinYield.hpp"
+#include "utilities/waitBarrier_generic.hpp"
 
 // Implements the striped semaphore wait barrier.
 //
diff --git a/src/hotspot/share/utilities/xmlstream.cpp b/src/hotspot/share/utilities/xmlstream.cpp
index 5d57584a8ab..6dacab1dc25 100644
--- a/src/hotspot/share/utilities/xmlstream.cpp
+++ b/src/hotspot/share/utilities/xmlstream.cpp
@@ -26,8 +26,8 @@
 #include "memory/allocation.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
-#include "oops/methodData.hpp"
 #include "oops/method.inline.hpp"
+#include "oops/methodData.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/deoptimization.hpp"
 #include "runtime/handles.inline.hpp"
diff --git a/test/hotspot/jtreg/sources/TestIncludesAreSorted.java b/test/hotspot/jtreg/sources/TestIncludesAreSorted.java
index 222b97d6056..802cb84515d 100644
--- a/test/hotspot/jtreg/sources/TestIncludesAreSorted.java
+++ b/test/hotspot/jtreg/sources/TestIncludesAreSorted.java
@@ -48,7 +48,8 @@ public class TestIncludesAreSorted {
                     "share/compiler",
                     "share/jvmci",
                     "share/oops",
-                    "share/opto"
+                    "share/opto",
+                    "share/utilities"
     };
 
     /**