[NFC] Cleanup in Support headers.

bolt/tools/merge-fdata/merge-fdata.cpp

@@ -21,6 +21,7 @@
 #include "llvm/Support/PrettyStackTrace.h"
 #include "llvm/Support/Signals.h"
 #include "llvm/Support/ThreadPool.h"
+#include "llvm/Support/thread.h"
 #include <algorithm>
 #include <mutex>
 #include <unordered_map>

clang/lib/CodeGen/ObjectFilePCHContainerWriter.cpp

@@ -30,6 +30,7 @@
 #include "llvm/MC/TargetRegistry.h"
 #include "llvm/Object/COFF.h"
 #include "llvm/Object/ObjectFile.h"
+#include "llvm/Support/Debug.h"
 #include "llvm/Support/Path.h"
 #include <memory>
 #include <utility>

clang/lib/Format/Format.cpp

@@ -23,6 +23,7 @@
 #include "UsingDeclarationsSorter.h"
 #include "clang/Tooling/Inclusions/HeaderIncludes.h"
 #include "llvm/ADT/Sequence.h"
+#include "llvm/Support/Debug.h"
 
 #define DEBUG_TYPE "format-formatter"
 

clang/lib/Format/FormatTokenSource.h

@@ -16,6 +16,7 @@
 #define LLVM_CLANG_LIB_FORMAT_FORMATTOKENSOURCE_H
 
 #include "UnwrappedLineParser.h"
+#include "llvm/Support/Debug.h"
 
 #define DEBUG_TYPE "format-token-source"
 

clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp

@@ -28,6 +28,7 @@
 #include "clang/StaticAnalyzer/Core/PathSensitive/ProgramStateTrait.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/StringRef.h"
+#include "llvm/Support/Debug.h"
 #include "llvm/Support/YAMLTraits.h"
 
 #include <limits>

clang/tools/driver/driver.cpp

@@ -35,6 +35,7 @@
 #include "llvm/Support/BuryPointer.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/CrashRecoveryContext.h"
+#include "llvm/Support/Debug.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/LLVMDriver.h"

clang/unittests/Format/MacroCallReconstructorTest.cpp

@@ -4,6 +4,7 @@
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
+#include "llvm/Support/Debug.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"

lld/ELF/Writer.cpp

@@ -27,6 +27,7 @@
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/StringMap.h"
 #include "llvm/Support/BLAKE3.h"
+#include "llvm/Support/Debug.h"
 #include "llvm/Support/Parallel.h"
 #include "llvm/Support/RandomNumberGenerator.h"
 #include "llvm/Support/TimeProfiler.h"

lld/MachO/BPSectionOrderer.cpp

@@ -13,6 +13,7 @@
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ProfileData/InstrProfReader.h"
 #include "llvm/Support/BalancedPartitioning.h"
+#include "llvm/Support/Debug.h"
 #include "llvm/Support/TimeProfiler.h"
 #include "llvm/Support/VirtualFileSystem.h"
 #include "llvm/Support/xxhash.h"

lld/MachO/Dwarf.cpp

@@ -10,7 +10,7 @@
 #include "InputFiles.h"
 #include "InputSection.h"
 #include "OutputSegment.h"
-
+#include "llvm/ADT/StringSwitch.h"
 #include <memory>
 
 using namespace lld;

lld/MachO/SectionPriorities.cpp

@@ -23,6 +23,7 @@
 #include "lld/Common/ErrorHandler.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/MapVector.h"
+#include "llvm/ADT/StringSwitch.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/TimeProfiler.h"
 #include "llvm/Support/raw_ostream.h"

lld/wasm/WriterUtils.h

@@ -12,6 +12,7 @@
 #include "lld/Common/LLVM.h"
 #include "llvm/ADT/Twine.h"
 #include "llvm/Object/Wasm.h"
+#include "llvm/Support/Debug.h"
 
 namespace lld {
 namespace wasm {

llvm/include/llvm/Analysis/BlockFrequencyInfoImpl.h

@@ -59,7 +59,6 @@ extern llvm::cl::opt<unsigned> IterativeBFIMaxIterationsPerBlock;
 extern llvm::cl::opt<double> IterativeBFIPrecision;
 
 class BranchProbabilityInfo;
-class Function;
 class Loop;
 class LoopInfo;
 class MachineBasicBlock;

llvm/include/llvm/Support/Atomic.h

@@ -17,7 +17,7 @@
 #ifndef LLVM_SUPPORT_ATOMIC_H
 #define LLVM_SUPPORT_ATOMIC_H
 
-#include "llvm/Support/DataTypes.h"
+#include <cstdint>
 
 // Windows will at times define MemoryFence.
 #ifdef MemoryFence

llvm/include/llvm/Support/BalancedPartitioning.h

@@ -39,9 +39,7 @@
 #ifndef LLVM_SUPPORT_BALANCED_PARTITIONING_H
 #define LLVM_SUPPORT_BALANCED_PARTITIONING_H
 
-#include "raw_ostream.h"
 #include "llvm/ADT/ArrayRef.h"
-
 #include <atomic>
 #include <condition_variable>
 #include <mutex>
@@ -51,6 +49,8 @@
 namespace llvm {
 
 class ThreadPoolInterface;
+class raw_ostream;
+
 /// A function with a set of utility nodes where it is beneficial to order two
 /// functions close together if they have similar utility nodes
 class BPFunctionNode {

llvm/include/llvm/Support/BinaryStreamReader.h

@@ -11,7 +11,6 @@
 
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Alignment.h"
 #include "llvm/Support/BinaryStreamArray.h"
 #include "llvm/Support/BinaryStreamRef.h"
 #include "llvm/Support/ConvertUTF.h"

llvm/include/llvm/Support/BranchProbability.h

@@ -13,7 +13,6 @@
 #ifndef LLVM_SUPPORT_BRANCHPROBABILITY_H
 #define LLVM_SUPPORT_BRANCHPROBABILITY_H
 
-#include "llvm/Support/DataTypes.h"
 #include <algorithm>
 #include <cassert>
 #include <iterator>

llvm/include/llvm/Support/CRC.h

@@ -13,7 +13,7 @@
 #ifndef LLVM_SUPPORT_CRC_H
 #define LLVM_SUPPORT_CRC_H
 
-#include "llvm/Support/DataTypes.h"
+#include <cstdint>
 
 namespace llvm {
 template <typename T> class ArrayRef;

llvm/include/llvm/Support/CachePruning.h

@@ -14,13 +14,15 @@
 #ifndef LLVM_SUPPORT_CACHEPRUNING_H
 #define LLVM_SUPPORT_CACHEPRUNING_H
 
-#include "llvm/Support/MemoryBuffer.h"
 #include <chrono>
+#include <memory>
 #include <optional>
+#include <vector>
 
 namespace llvm {
 
 template <typename T> class Expected;
+class MemoryBuffer;
 class StringRef;
 
 /// Policy for the pruneCache() function. A default constructed

llvm/include/llvm/Support/Casting.h

@@ -14,7 +14,6 @@
 #ifndef LLVM_SUPPORT_CASTING_H
 #define LLVM_SUPPORT_CASTING_H
 
-#include "llvm/Support/Compiler.h"
 #include "llvm/Support/type_traits.h"
 #include <cassert>
 #include <memory>

llvm/include/llvm/Support/Chrono.h

@@ -9,17 +9,13 @@
 #ifndef LLVM_SUPPORT_CHRONO_H
 #define LLVM_SUPPORT_CHRONO_H
 
-#include "llvm/Support/Compiler.h"
-#include "llvm/Support/FormatProviders.h"
-
+#include "llvm/Support/FormatVariadicDetails.h"
 #include <chrono>
 #include <ctime>
 #include <ratio>
 
 namespace llvm {
 
-class raw_ostream;
-
 namespace sys {
 
 /// A time point on the system clock. This is provided for two reasons:

llvm/include/llvm/Support/CommandLine.h

@@ -20,7 +20,6 @@
 #define LLVM_SUPPORT_COMMANDLINE_H
 
 #include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringMap.h"
@@ -31,7 +30,6 @@
 #include "llvm/Support/StringSaver.h"
 #include "llvm/Support/raw_ostream.h"
 #include <cassert>
-#include <climits>
 #include <cstddef>
 #include <functional>
 #include <initializer_list>
@@ -45,8 +43,6 @@ namespace vfs {
 class FileSystem;
 }
 
-class StringSaver;
-
 /// This namespace contains all of the command line option processing machinery.
 /// It is intentionally a short name to make qualified usage concise.
 namespace cl {

llvm/include/llvm/Support/Compression.h

@@ -13,10 +13,12 @@
 #ifndef LLVM_SUPPORT_COMPRESSION_H
 #define LLVM_SUPPORT_COMPRESSION_H
 
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/Support/DataTypes.h"
+#include "llvm/Support/ErrorHandling.h"
+#include <cstddef>
+#include <cstdint>
 
 namespace llvm {
+template <typename T> class ArrayRef;
 template <typename T> class SmallVectorImpl;
 class Error;
 

llvm/include/llvm/Support/ConvertEBCDIC.h

@@ -13,11 +13,13 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
 #include <system_error>
 
 namespace llvm {
+
+template <typename T> class SmallVectorImpl;
+
 namespace ConverterEBCDIC {
 std::error_code convertToEBCDIC(StringRef Source,
                                 SmallVectorImpl<char> &Result);

llvm/include/llvm/Support/DataExtractor.h

@@ -10,7 +10,6 @@
 #define LLVM_SUPPORT_DATAEXTRACTOR_H
 
 #include "llvm/ADT/StringRef.h"
-#include "llvm/Support/DataTypes.h"
 #include "llvm/Support/Error.h"
 
 namespace llvm {

llvm/include/llvm/Support/DebugCounter.h

@@ -42,16 +42,16 @@
 #ifndef LLVM_SUPPORT_DEBUGCOUNTER_H
 #define LLVM_SUPPORT_DEBUGCOUNTER_H
 
-#include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/DenseMap.h"
+#include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/UniqueVector.h"
-#include "llvm/Support/Debug.h"
 #include <string>
 
 namespace llvm {
 
 class raw_ostream;
+template <typename T> class ArrayRef;
 
 class DebugCounter {
 public:

llvm/include/llvm/Support/ELFAttributeParser.h

@@ -18,7 +18,6 @@
 #include <unordered_map>
 
 namespace llvm {
-class StringRef;
 class ScopedPrinter;
 
 class ELFAttributeParser {

llvm/include/llvm/Support/Error.h

@@ -17,14 +17,12 @@
 #include "llvm/ADT/Twine.h"
 #include "llvm/Config/abi-breaking.h"
 #include "llvm/Support/AlignOf.h"
-#include "llvm/Support/Compiler.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/ErrorOr.h"
 #include "llvm/Support/Format.h"
 #include "llvm/Support/raw_ostream.h"
 #include <cassert>
-#include <cstdint>
 #include <cstdlib>
 #include <functional>
 #include <memory>

llvm/include/llvm/Support/ErrorHandling.h

@@ -14,8 +14,6 @@
 #ifndef LLVM_SUPPORT_ERRORHANDLING_H
 #define LLVM_SUPPORT_ERRORHANDLING_H
 
-#include "llvm/Support/Compiler.h"
-
 namespace llvm {
   class StringRef;
   class Twine;

llvm/include/llvm/Support/ExponentialBackoff.h

@@ -12,8 +12,6 @@
 #ifndef LLVM_EXPONENTIALBACKOFF_H
 #define LLVM_EXPONENTIALBACKOFF_H
 
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/Support/Error.h"
 #include <chrono>
 #include <random>
 

llvm/include/llvm/Support/FileOutputBuffer.h

@@ -14,7 +14,6 @@
 #define LLVM_SUPPORT_FILEOUTPUTBUFFER_H
 
 #include "llvm/ADT/StringRef.h"
-#include "llvm/Support/DataTypes.h"
 #include "llvm/Support/Error.h"
 
 namespace llvm {

llvm/include/llvm/Support/FileUtilities.h

@@ -18,8 +18,6 @@
 #include "llvm/Support/Error.h"
 #include "llvm/Support/FileSystem.h"
 
-#include <system_error>
-
 namespace llvm {
 
   /// DiffFilesWithTolerance - Compare the two files specified, returning 0 if

llvm/include/llvm/Support/FormatVariadic.h

@@ -26,7 +26,6 @@
 #define LLVM_SUPPORT_FORMATVARIADIC_H
 
 #include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"

llvm/include/llvm/Support/LineIterator.h

@@ -10,7 +10,6 @@
 #define LLVM_SUPPORT_LINEITERATOR_H
 
 #include "llvm/ADT/StringRef.h"
-#include "llvm/Support/DataTypes.h"
 #include "llvm/Support/MemoryBufferRef.h"
 #include <iterator>
 #include <optional>

llvm/include/llvm/Support/LockFileManager.h

@@ -14,7 +14,6 @@
 #include <utility> // for std::pair
 
 namespace llvm {
-class StringRef;
 
 /// Class that manages the creation of a lock file to aid
 /// implicit coordination between different processes.

llvm/include/llvm/Support/MathExtras.h

@@ -14,7 +14,6 @@
 #define LLVM_SUPPORT_MATHEXTRAS_H
 
 #include "llvm/ADT/bit.h"
-#include "llvm/Support/Compiler.h"
 #include <cassert>
 #include <climits>
 #include <cstdint>

llvm/include/llvm/Support/Memory.h

@@ -13,7 +13,6 @@
 #ifndef LLVM_SUPPORT_MEMORY_H
 #define LLVM_SUPPORT_MEMORY_H
 
-#include "llvm/Support/DataTypes.h"
 #include <system_error>
 
 namespace llvm {

llvm/include/llvm/Support/OptimizedStructLayout.h

@@ -36,11 +36,12 @@
 #define LLVM_SUPPORT_OPTIMIZEDSTRUCTLAYOUT_H
 
 #include "llvm/Support/Alignment.h"
-#include "llvm/ADT/ArrayRef.h"
 #include <utility>
 
 namespace llvm {
 
+template <typename T> class MutableArrayRef;
+
 /// A field in a structure.
 struct OptimizedStructLayoutField {
   /// A special value for Offset indicating that the field can be moved