From 11eccfc85f8495b0cbc3965fd69911a6c7ed0140 Mon Sep 17 00:00:00 2001
From: Francesco Andreuzzi <andreuzzi.francesco@gmail.com>
Date: Thu, 21 Aug 2025 18:58:27 +0000
Subject: [PATCH] 8365917: Sort share/logging includes

Reviewed-by: ayang, phh
---
 src/hotspot/share/logging/log.hpp                     | 2 +-
 src/hotspot/share/logging/logDecorators.hpp           | 2 +-
 src/hotspot/share/logging/logFileStreamOutput.cpp     | 1 +
 src/hotspot/share/logging/logTag.cpp                  | 2 +-
 test/hotspot/jtreg/sources/TestIncludesAreSorted.java | 1 +
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/logging/log.hpp b/src/hotspot/share/logging/log.hpp
index 87c7cd926fb..7820e2c21d1 100644
--- a/src/hotspot/share/logging/log.hpp
+++ b/src/hotspot/share/logging/log.hpp
@@ -26,8 +26,8 @@
 
 #include "logging/logLevel.hpp"
 #include "logging/logPrefix.hpp"
-#include "logging/logTagSet.hpp"
 #include "logging/logTag.hpp"
+#include "logging/logTagSet.hpp"
 #include "utilities/debug.hpp"
 
 class LogMessageBuffer;
diff --git a/src/hotspot/share/logging/logDecorators.hpp b/src/hotspot/share/logging/logDecorators.hpp
index 9e38f429974..5b245626ade 100644
--- a/src/hotspot/share/logging/logDecorators.hpp
+++ b/src/hotspot/share/logging/logDecorators.hpp
@@ -24,8 +24,8 @@
 #ifndef SHARE_LOGGING_LOGDECORATORS_HPP
 #define SHARE_LOGGING_LOGDECORATORS_HPP
 
-#include "utilities/globalDefinitions.hpp"
 #include "logging/logSelection.hpp"
+#include "utilities/globalDefinitions.hpp"
 
 class outputStream;
 
diff --git a/src/hotspot/share/logging/logFileStreamOutput.cpp b/src/hotspot/share/logging/logFileStreamOutput.cpp
index bc753676706..394c310b940 100644
--- a/src/hotspot/share/logging/logFileStreamOutput.cpp
+++ b/src/hotspot/share/logging/logFileStreamOutput.cpp
@@ -29,6 +29,7 @@
 #include "logging/logMessageBuffer.hpp"
 #include "memory/allocation.inline.hpp"
 #include "utilities/defaultStream.hpp"
+
 #include <string.h>
 
 const char* const LogFileStreamOutput::FoldMultilinesOptionKey = "foldmultilines";
diff --git a/src/hotspot/share/logging/logTag.cpp b/src/hotspot/share/logging/logTag.cpp
index d2aeeebfc79..41554c3acb8 100644
--- a/src/hotspot/share/logging/logTag.cpp
+++ b/src/hotspot/share/logging/logTag.cpp
@@ -22,9 +22,9 @@
  *
  */
 #include "logging/logTag.hpp"
-#include "utilities/stringUtils.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/ostream.hpp"
+#include "utilities/stringUtils.hpp"
 
 const char* const LogTag::_name[] = {
   "", // __NO_TAG
diff --git a/test/hotspot/jtreg/sources/TestIncludesAreSorted.java b/test/hotspot/jtreg/sources/TestIncludesAreSorted.java
index 5d8c60e23e0..1a304a44944 100644
--- a/test/hotspot/jtreg/sources/TestIncludesAreSorted.java
+++ b/test/hotspot/jtreg/sources/TestIncludesAreSorted.java
@@ -54,6 +54,7 @@ public class TestIncludesAreSorted {
                     "share/jfr",
                     "share/jvmci",
                     "share/libadt",
+                    "share/logging",
                     "share/metaprogramming",
                     "share/oops",
                     "share/opto",