Skip to content

Commit 89e6a28

Browse files
authored
[NFC] Add explicit #include llvm-config.h where its macros are used. (#106621)
Without these explicit includes, removing other headers, who implicitly include llvm-config.h, may have non-trivial side effects.
1 parent 8ca6401 commit 89e6a28

31 files changed

+39
-16
lines changed

llvm/include/llvm/ADT/ConcurrentHashtable.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include "llvm/ADT/Hashing.h"
1414
#include "llvm/ADT/STLExtras.h"
1515
#include "llvm/ADT/SmallVector.h"
16+
#include "llvm/Config/llvm-config.h" // for LLVM_ENABLE_THREADS
1617
#include "llvm/Support/Allocator.h"
1718
#include "llvm/Support/Debug.h"
1819
#include "llvm/Support/Parallel.h"

llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/ExecutorSharedMemoryMapperService.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#define LLVM_EXECUTIONENGINE_ORC_TARGETPROCESS_EXECUTORSHAREDMEMORYMAPPERSERVICE_H
1111

1212
#include "llvm/ADT/DenseMap.h"
13+
#include "llvm/Config/llvm-config.h" // for LLVM_ON_UNIX
1314
#include "llvm/ExecutionEngine/Orc/Shared/TargetProcessControlTypes.h"
1415
#include "llvm/ExecutionEngine/Orc/TargetProcess/ExecutorBootstrapService.h"
1516

llvm/lib/ExecutionEngine/Orc/LLJIT.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "llvm/ExecutionEngine/Orc/LLJIT.h"
10+
#include "llvm/Config/llvm-config.h" // for LLVM_ENABLE_THREADS
1011
#include "llvm/ExecutionEngine/JITLink/EHFrameSupport.h"
1112
#include "llvm/ExecutionEngine/JITLink/JITLinkMemoryManager.h"
1213
#include "llvm/ExecutionEngine/Orc/COFFPlatform.h"

llvm/lib/ExecutionEngine/Orc/MemoryMapper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
#include "llvm/ExecutionEngine/Orc/MemoryMapper.h"
1010

11+
#include "llvm/Config/llvm-config.h" // for LLVM_ON_UNIX
1112
#include "llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h"
1213
#include "llvm/Support/WindowsError.h"
13-
1414
#include <algorithm>
1515

1616
#if defined(LLVM_ON_UNIX) && !defined(__ANDROID__)

llvm/lib/ExecutionEngine/Orc/Shared/SimpleRemoteEPCUtils.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
//===----------------------------------------------------------------------===//
1313

1414
#include "llvm/ExecutionEngine/Orc/Shared/SimpleRemoteEPCUtils.h"
15+
#include "llvm/Config/llvm-config.h" // for LLVM_ENABLE_THREADS
1516
#include "llvm/Support/Endian.h"
1617
#include "llvm/Support/FormatVariadic.h"
1718

llvm/lib/ExecutionEngine/Orc/TargetProcess/ExecutorSharedMemoryMapperService.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "llvm/ExecutionEngine/Orc/TargetProcess/ExecutorSharedMemoryMapperService.h"
10-
10+
#include "llvm/Config/llvm-config.h" // for LLVM_ON_UNIX
1111
#include "llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h"
1212
#include "llvm/Support/Process.h"
1313
#include "llvm/Support/WindowsError.h"
14-
1514
#include <sstream>
1615

1716
#if defined(LLVM_ON_UNIX)

llvm/lib/ExecutionEngine/Orc/TaskDispatch.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "llvm/ExecutionEngine/Orc/TaskDispatch.h"
10+
#include "llvm/Config/llvm-config.h" // for LLVM_ENABLE_THREADS
1011
#include "llvm/ExecutionEngine/Orc/Core.h"
1112

1213
namespace llvm {

llvm/lib/Support/BalancedPartitioning.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
//===----------------------------------------------------------------------===//
1313

1414
#include "llvm/Support/BalancedPartitioning.h"
15+
#include "llvm/Config/llvm-config.h" // for LLVM_ENABLE_THREADS
1516
#include "llvm/Support/Debug.h"
1617
#include "llvm/Support/Format.h"
1718
#include "llvm/Support/FormatVariadic.h"

llvm/lib/Support/ErrorHandling.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include "llvm/ADT/SmallVector.h"
1717
#include "llvm/ADT/Twine.h"
1818
#include "llvm/Config/config.h"
19+
#include "llvm/Config/llvm-config.h" // for LLVM_ENABLE_THREADS
1920
#include "llvm/Support/Debug.h"
2021
#include "llvm/Support/Errc.h"
2122
#include "llvm/Support/Error.h"

llvm/lib/Support/LockFileManager.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "llvm/Support/LockFileManager.h"
1010
#include "llvm/ADT/SmallVector.h"
1111
#include "llvm/ADT/StringExtras.h"
12+
#include "llvm/Config/llvm-config.h" // for LLVM_ON_UNIX
1213
#include "llvm/Support/Errc.h"
1314
#include "llvm/Support/ErrorOr.h"
1415
#include "llvm/Support/ExponentialBackoff.h"

llvm/lib/Support/RWMutex.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#include "llvm/Support/Allocator.h"
1413
#include "llvm/Support/RWMutex.h"
1514
#include "llvm/Config/config.h"
15+
#include "llvm/Config/llvm-config.h" // for LLVM_ENABLE_THREADS
16+
#include "llvm/Support/Allocator.h"
1617

1718
#if defined(LLVM_USE_RW_MUTEX_IMPL)
1819
using namespace llvm;

llvm/lib/Support/Unix/Process.inc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "llvm/ADT/Hashing.h"
1515
#include "llvm/ADT/StringRef.h"
1616
#include "llvm/Config/config.h"
17+
#include "llvm/Config/llvm-config.h" // for LLVM_ENABLE_THREADS
1718
#include <mutex>
1819
#include <optional>
1920
#if HAVE_FCNTL_H

llvm/tools/lli/ChildTarget/ChildTarget.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13+
#include "llvm/Config/llvm-config.h" // for LLVM_ENABLE_THREADS
1314
#include "llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderGDB.h"
1415
#include "llvm/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.h"
1516
#include "llvm/ExecutionEngine/Orc/TargetProcess/SimpleExecutorMemoryManager.h"

llvm/tools/llvm-exegesis/lib/BenchmarkRunner.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,8 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#include <cmath>
10-
#include <memory>
11-
#include <string>
12-
13-
#include "Assembler.h"
149
#include "BenchmarkRunner.h"
10+
#include "Assembler.h"
1511
#include "Error.h"
1612
#include "MCInstrDescView.h"
1713
#include "MmapUtils.h"
@@ -22,13 +18,17 @@
2218
#include "llvm/ADT/StringExtras.h"
2319
#include "llvm/ADT/StringRef.h"
2420
#include "llvm/ADT/Twine.h"
21+
#include "llvm/Config/llvm-config.h" // for LLVM_ON_UNIX
2522
#include "llvm/Support/CrashRecoveryContext.h"
2623
#include "llvm/Support/Error.h"
2724
#include "llvm/Support/FileSystem.h"
2825
#include "llvm/Support/MemoryBuffer.h"
2926
#include "llvm/Support/Program.h"
3027
#include "llvm/Support/Signals.h"
3128
#include "llvm/Support/SystemZ/zOSSupport.h"
29+
#include <cmath>
30+
#include <memory>
31+
#include <string>
3232

3333
#ifdef __linux__
3434
#ifdef HAVE_LIBPFM

llvm/tools/llvm-exegesis/lib/Error.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "Error.h"
10+
#include "llvm/Config/llvm-config.h" // for LLVM_ON_UNIX
1011

1112
#ifdef LLVM_ON_UNIX
1213
#include "llvm/Support/SystemZ/zOSSupport.h"

llvm/tools/llvm-jitlink/llvm-jitlink-executor/llvm-jitlink-executor.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
#include "llvm/ADT/StringRef.h"
14+
#include "llvm/Config/llvm-config.h" // for LLVM_ON_UNIX, LLVM_ENABLE_THREADS
1415
#include "llvm/ExecutionEngine/Orc/TargetProcess/ExecutorSharedMemoryMapperService.h"
1516
#include "llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderGDB.h"
1617
#include "llvm/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.h"

llvm/tools/llvm-jitlink/llvm-jitlink.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
#include "llvm-jitlink.h"
16-
1716
#include "llvm/BinaryFormat/Magic.h"
17+
#include "llvm/Config/llvm-config.h" // for LLVM_ON_UNIX, LLVM_ENABLE_THREADS
1818
#include "llvm/ExecutionEngine/Orc/COFFPlatform.h"
1919
#include "llvm/ExecutionEngine/Orc/COFFVCRuntimeSupport.h"
2020
#include "llvm/ExecutionEngine/Orc/DebugObjectManagerPlugin.h"
@@ -60,7 +60,6 @@
6060
#include "llvm/Support/Process.h"
6161
#include "llvm/Support/TargetSelect.h"
6262
#include "llvm/Support/Timer.h"
63-
6463
#include <cstring>
6564
#include <deque>
6665
#include <string>

llvm/tools/llvm-mt/llvm-mt.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
//
1212
//===---------------------------------------------------------------------===//
1313

14+
#include "llvm/Config/llvm-config.h" // for LLVM_ON_UNIX
1415
#include "llvm/Option/Arg.h"
1516
#include "llvm/Option/ArgList.h"
1617
#include "llvm/Option/Option.h"

llvm/tools/llvm-reduce/deltas/Delta.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "llvm/Bitcode/BitcodeReader.h"
2323
#include "llvm/Bitcode/BitcodeWriter.h"
2424
#include "llvm/CodeGen/MachineFunction.h"
25+
#include "llvm/Config/llvm-config.h" // for LLVM_ENABLE_THREADS
2526
#include "llvm/IR/Module.h"
2627
#include "llvm/IR/Verifier.h"
2728
#include "llvm/MC/TargetRegistry.h"

llvm/unittests/Analysis/MLModelRunnerTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include "llvm/Analysis/InteractiveModelRunner.h"
1212
#include "llvm/Analysis/NoInferenceModelRunner.h"
1313
#include "llvm/Analysis/ReleaseModeModelRunner.h"
14+
#include "llvm/Config/llvm-config.h" // for LLVM_ON_UNIX
1415
#include "llvm/Support/BinaryByteStream.h"
1516
#include "llvm/Support/ErrorHandling.h"
1617
#include "llvm/Support/FileSystem.h"
@@ -20,7 +21,6 @@
2021
#include "llvm/Support/raw_ostream.h"
2122
#include "llvm/Testing/Support/SupportHelpers.h"
2223
#include "gtest/gtest.h"
23-
2424
#include <atomic>
2525
#include <thread>
2626

llvm/unittests/ExecutionEngine/Orc/SharedMemoryMapperTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "OrcTestCommon.h"
10-
10+
#include "llvm/Config/llvm-config.h" // for LLVM_ON_UNIX
1111
#include "llvm/ExecutionEngine/Orc/MemoryMapper.h"
1212
#include "llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h"
1313
#include "llvm/ExecutionEngine/Orc/TargetProcess/ExecutorSharedMemoryMapperService.h"

llvm/unittests/ExecutionEngine/Orc/TaskDispatchTest.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "llvm/ExecutionEngine/Orc/TaskDispatch.h"
10+
#include "llvm/Config/llvm-config.h" // for LLVM_ENABLE_THREADS
1011
#include "gtest/gtest.h"
1112

1213
#include <future>

llvm/unittests/Support/CrashRecoveryTest.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "llvm/Config/config.h"
10+
#include "llvm/Config/llvm-config.h" // for LLVM_ON_UNIX
1011
#include "llvm/Support/CommandLine.h"
1112
#include "llvm/Support/Compiler.h"
1213
#include "llvm/Support/CrashRecoveryContext.h"

llvm/unittests/Support/ManagedStatic.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#include "llvm/Support/Allocator.h"
109
#include "llvm/Support/ManagedStatic.h"
1110
#include "llvm/Config/config.h"
11+
#include "llvm/Config/llvm-config.h" // for LLVM_ENABLE_THREADS
12+
#include "llvm/Support/Allocator.h"
13+
#include "gtest/gtest.h"
1214
#ifdef HAVE_PTHREAD_H
1315
#include <pthread.h>
1416
#endif

llvm/unittests/Support/MemoryBufferTest.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
#include "llvm/Support/MemoryBuffer.h"
14-
#include "llvm/Support/SmallVectorMemoryBuffer.h"
1514
#include "llvm/ADT/ScopeExit.h"
15+
#include "llvm/Config/llvm-config.h" // for LLVM_ENABLE_THREADS, LLVM_ON_UNIX
1616
#include "llvm/Support/FileSystem.h"
1717
#include "llvm/Support/FileUtilities.h"
1818
#include "llvm/Support/Process.h"
19+
#include "llvm/Support/SmallVectorMemoryBuffer.h"
1920
#include "llvm/Support/raw_ostream.h"
2021
#include "llvm/Testing/Support/Error.h"
2122
#include "gtest/gtest.h"

llvm/unittests/Support/ParallelTest.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
//===----------------------------------------------------------------------===//
1313

1414
#include "llvm/Support/Parallel.h"
15+
#include "llvm/Config/llvm-config.h" // for LLVM_ENABLE_THREADS
1516
#include "llvm/Support/ThreadPool.h"
1617
#include "gtest/gtest.h"
1718
#include <array>

llvm/unittests/Support/Path.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include "llvm/ADT/SmallVector.h"
1313
#include "llvm/BinaryFormat/Magic.h"
1414
#include "llvm/Config/llvm-config.h"
15+
#include "llvm/Config/llvm-config.h" // for LLVM_ON_UNIX
1516
#include "llvm/Support/Compiler.h"
1617
#include "llvm/Support/ConvertUTF.h"
1718
#include "llvm/Support/Duration.h"

llvm/unittests/Support/ThreadPool.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "llvm/Support/ThreadPool.h"
10-
1110
#include "llvm/ADT/STLExtras.h"
1211
#include "llvm/ADT/SetVector.h"
1312
#include "llvm/ADT/SmallVector.h"
13+
#include "llvm/Config/llvm-config.h" // for LLVM_ENABLE_THREADS
1414
#include "llvm/Support/CommandLine.h"
1515
#include "llvm/Support/Program.h"
1616
#include "llvm/Support/TargetSelect.h"

llvm/unittests/Support/Threading.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "llvm/Support/Threading.h"
10+
#include "llvm/Config/llvm-config.h" // for LLVM_ENABLE_THREADS
1011
#include "llvm/Support/thread.h"
1112
#include "llvm/TargetParser/Host.h"
1213
#include "llvm/TargetParser/Triple.h"

llvm/unittests/Support/WithColorTest.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "llvm/Support/WithColor.h"
10+
#include "llvm/Config/llvm-config.h" // for LLVM_ON_UNIX
1011
#include "gtest/gtest.h"
1112

1213
using namespace llvm;

llvm/unittests/Support/raw_ostream_test.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "llvm/ADT/SmallString.h"
10+
#include "llvm/Config/llvm-config.h" // for LLVM_ON_UNIX
1011
#include "llvm/Support/Errc.h"
1112
#include "llvm/Support/FileSystem.h"
1213
#include "llvm/Support/FileUtilities.h"

0 commit comments

Comments
 (0)