Skip to content

Commit 6c37341

Browse files
[Driver] Remove unused includes (NFC) (#141448)
These are identified by misc-include-cleaner. I've filtered out those that break builds. Also, I'm staying away from llvm-config.h, config.h, and Compiler.h, which likely cause platform- or compiler-specific build failures.
1 parent fe83587 commit 6c37341

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+0
-107
lines changed

clang/lib/Driver/ToolChains/AIX.cpp

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

99
#include "AIX.h"
10-
#include "Arch/PPC.h"
1110
#include "CommonArgs.h"
1211
#include "clang/Driver/Compilation.h"
1312
#include "clang/Driver/Options.h"

clang/lib/Driver/ToolChains/AMDGPU.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include "clang/Basic/TargetID.h"
1212
#include "clang/Config/config.h"
1313
#include "clang/Driver/Compilation.h"
14-
#include "clang/Driver/DriverDiagnostic.h"
1514
#include "clang/Driver/InputInfo.h"
1615
#include "clang/Driver/Options.h"
1716
#include "clang/Driver/SanitizerArgs.h"

clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,11 @@
88

99
#include "AMDGPUOpenMP.h"
1010
#include "AMDGPU.h"
11-
#include "CommonArgs.h"
12-
#include "ROCm.h"
13-
#include "clang/Basic/DiagnosticDriver.h"
1411
#include "clang/Driver/Compilation.h"
1512
#include "clang/Driver/Driver.h"
16-
#include "clang/Driver/DriverDiagnostic.h"
17-
#include "clang/Driver/InputInfo.h"
1813
#include "clang/Driver/Options.h"
1914
#include "clang/Driver/Tool.h"
2015
#include "llvm/ADT/STLExtras.h"
21-
#include "llvm/Support/FileSystem.h"
22-
#include "llvm/Support/FormatAdapters.h"
23-
#include "llvm/Support/FormatVariadic.h"
24-
#include "llvm/Support/Path.h"
2516

2617
using namespace clang::driver;
2718
using namespace clang::driver::toolchains;

clang/lib/Driver/ToolChains/AVR.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,8 @@
99
#include "AVR.h"
1010
#include "CommonArgs.h"
1111
#include "clang/Driver/Compilation.h"
12-
#include "clang/Driver/DriverDiagnostic.h"
1312
#include "clang/Driver/InputInfo.h"
1413
#include "clang/Driver/Options.h"
15-
#include "llvm/ADT/StringExtras.h"
16-
#include "llvm/MC/MCSubtargetInfo.h"
1714
#include "llvm/Option/ArgList.h"
1815
#include "llvm/Support/FileSystem.h"
1916
#include "llvm/Support/Path.h"

clang/lib/Driver/ToolChains/Arch/AArch64.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include "AArch64.h"
1010
#include "../CommonArgs.h"
1111
#include "clang/Driver/Driver.h"
12-
#include "clang/Driver/DriverDiagnostic.h"
1312
#include "clang/Driver/Options.h"
1413
#include "llvm/Option/ArgList.h"
1514
#include "llvm/TargetParser/AArch64TargetParser.h"

clang/lib/Driver/ToolChains/Arch/ARM.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
#include "ARM.h"
1010
#include "clang/Driver/Driver.h"
11-
#include "clang/Driver/DriverDiagnostic.h"
1211
#include "clang/Driver/Options.h"
1312
#include "llvm/ADT/StringSwitch.h"
1413
#include "llvm/Option/ArgList.h"

clang/lib/Driver/ToolChains/Arch/CSKY.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,10 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "CSKY.h"
10-
#include "ToolChains/CommonArgs.h"
11-
#include "clang/Basic/CharInfo.h"
1210
#include "clang/Driver/Driver.h"
13-
#include "clang/Driver/DriverDiagnostic.h"
1411
#include "clang/Driver/Options.h"
1512
#include "llvm/ADT/StringSwitch.h"
1613
#include "llvm/Option/ArgList.h"
17-
#include "llvm/Support/raw_ostream.h"
1814
#include "llvm/TargetParser/CSKYTargetParser.h"
1915
#include "llvm/TargetParser/Host.h"
2016
#include "llvm/TargetParser/TargetParser.h"

clang/lib/Driver/ToolChains/Arch/LoongArch.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include "ToolChains/CommonArgs.h"
1212
#include "clang/Basic/DiagnosticDriver.h"
1313
#include "clang/Driver/Driver.h"
14-
#include "clang/Driver/DriverDiagnostic.h"
1514
#include "clang/Driver/Options.h"
1615
#include "llvm/TargetParser/Host.h"
1716
#include "llvm/TargetParser/LoongArchTargetParser.h"

clang/lib/Driver/ToolChains/Arch/M68k.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,12 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "M68k.h"
10-
#include "ToolChains/CommonArgs.h"
1110
#include "clang/Driver/Driver.h"
12-
#include "clang/Driver/DriverDiagnostic.h"
1311
#include "clang/Driver/Options.h"
14-
#include "llvm/ADT/SmallVector.h"
1512
#include "llvm/ADT/StringSwitch.h"
1613
#include "llvm/Option/ArgList.h"
1714
#include "llvm/Support/Regex.h"
1815
#include "llvm/TargetParser/Host.h"
19-
#include <sstream>
2016

2117
using namespace clang::driver;
2218
using namespace clang::driver::tools;

clang/lib/Driver/ToolChains/Arch/Mips.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include "Mips.h"
1010
#include "ToolChains/CommonArgs.h"
1111
#include "clang/Driver/Driver.h"
12-
#include "clang/Driver/DriverDiagnostic.h"
1312
#include "clang/Driver/Options.h"
1413
#include "llvm/ADT/StringSwitch.h"
1514
#include "llvm/Option/ArgList.h"

clang/lib/Driver/ToolChains/Arch/PPC.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include "PPC.h"
1010
#include "ToolChains/CommonArgs.h"
1111
#include "clang/Driver/Driver.h"
12-
#include "clang/Driver/DriverDiagnostic.h"
1312
#include "clang/Driver/Options.h"
1413
#include "llvm/ADT/StringSwitch.h"
1514
#include "llvm/Option/ArgList.h"

clang/lib/Driver/ToolChains/Arch/RISCV.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,10 @@
99
#include "RISCV.h"
1010
#include "../Clang.h"
1111
#include "ToolChains/CommonArgs.h"
12-
#include "clang/Basic/CharInfo.h"
1312
#include "clang/Driver/Driver.h"
14-
#include "clang/Driver/DriverDiagnostic.h"
1513
#include "clang/Driver/Options.h"
1614
#include "llvm/Option/ArgList.h"
1715
#include "llvm/Support/Error.h"
18-
#include "llvm/Support/raw_ostream.h"
1916
#include "llvm/TargetParser/Host.h"
2017
#include "llvm/TargetParser/RISCVISAInfo.h"
2118
#include "llvm/TargetParser/RISCVTargetParser.h"

clang/lib/Driver/ToolChains/Arch/Sparc.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
#include "Sparc.h"
1010
#include "clang/Driver/Driver.h"
11-
#include "clang/Driver/DriverDiagnostic.h"
1211
#include "clang/Driver/Options.h"
1312
#include "llvm/ADT/StringSwitch.h"
1413
#include "llvm/Option/ArgList.h"

clang/lib/Driver/ToolChains/Arch/SystemZ.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
#include "SystemZ.h"
1010
#include "clang/Config/config.h"
11-
#include "clang/Driver/DriverDiagnostic.h"
1211
#include "clang/Driver/Options.h"
1312
#include "llvm/Option/ArgList.h"
1413
#include "llvm/TargetParser/Host.h"

clang/lib/Driver/ToolChains/Arch/VE.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
#include "VE.h"
1010
#include "clang/Driver/Driver.h"
11-
#include "clang/Driver/DriverDiagnostic.h"
1211
#include "clang/Driver/Options.h"
1312
#include "llvm/Option/ArgList.h"
1413

clang/lib/Driver/ToolChains/Arch/X86.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "X86.h"
10-
#include "ToolChains/CommonArgs.h"
1110
#include "clang/Driver/Driver.h"
12-
#include "clang/Driver/DriverDiagnostic.h"
1311
#include "clang/Driver/Options.h"
1412
#include "llvm/ADT/StringExtras.h"
1513
#include "llvm/ADT/StringMap.h"

clang/lib/Driver/ToolChains/BareMetal.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,12 @@
1616
#include "Arch/RISCV.h"
1717
#include "clang/Driver/Compilation.h"
1818
#include "clang/Driver/Driver.h"
19-
#include "clang/Driver/DriverDiagnostic.h"
2019
#include "clang/Driver/MultilibBuilder.h"
2120
#include "clang/Driver/Options.h"
2221
#include "llvm/ADT/StringExtras.h"
2322
#include "llvm/Option/ArgList.h"
2423
#include "llvm/Support/Path.h"
2524
#include "llvm/Support/VirtualFileSystem.h"
26-
#include "llvm/Support/raw_ostream.h"
2725

2826
#include <sstream>
2927

clang/lib/Driver/ToolChains/CSKYToolChain.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include "llvm/Option/ArgList.h"
1515
#include "llvm/Support/FileSystem.h"
1616
#include "llvm/Support/Path.h"
17-
#include "llvm/Support/raw_ostream.h"
1817

1918
using namespace clang::driver;
2019
using namespace clang::driver::toolchains;

clang/lib/Driver/ToolChains/Clang.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,17 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "Clang.h"
10-
#include "AMDGPU.h"
11-
#include "Arch/AArch64.h"
1210
#include "Arch/ARM.h"
13-
#include "Arch/CSKY.h"
1411
#include "Arch/LoongArch.h"
15-
#include "Arch/M68k.h"
1612
#include "Arch/Mips.h"
1713
#include "Arch/PPC.h"
1814
#include "Arch/RISCV.h"
1915
#include "Arch/Sparc.h"
2016
#include "Arch/SystemZ.h"
21-
#include "Arch/VE.h"
22-
#include "Arch/X86.h"
2317
#include "CommonArgs.h"
2418
#include "Hexagon.h"
25-
#include "MSP430.h"
2619
#include "PS4CPU.h"
27-
#include "SYCL.h"
2820
#include "clang/Basic/CLWarnings.h"
29-
#include "clang/Basic/CharInfo.h"
3021
#include "clang/Basic/CodeGenOptions.h"
3122
#include "clang/Basic/HeaderInclude.h"
3223
#include "clang/Basic/LangOptions.h"
@@ -36,7 +27,6 @@
3627
#include "clang/Config/config.h"
3728
#include "clang/Driver/Action.h"
3829
#include "clang/Driver/Distro.h"
39-
#include "clang/Driver/DriverDiagnostic.h"
4030
#include "clang/Driver/InputInfo.h"
4131
#include "clang/Driver/Options.h"
4232
#include "clang/Driver/SanitizerArgs.h"

clang/lib/Driver/ToolChains/CommonArgs.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,15 @@
1919
#include "Arch/SystemZ.h"
2020
#include "Arch/VE.h"
2121
#include "Arch/X86.h"
22-
#include "BareMetal.h"
2322
#include "HIPAMD.h"
2423
#include "Hexagon.h"
2524
#include "MSP430.h"
2625
#include "Solaris.h"
27-
#include "clang/Basic/CharInfo.h"
2826
#include "clang/Basic/CodeGenOptions.h"
29-
#include "clang/Basic/LangOptions.h"
30-
#include "clang/Basic/ObjCRuntime.h"
31-
#include "clang/Basic/Version.h"
3227
#include "clang/Config/config.h"
3328
#include "clang/Driver/Action.h"
3429
#include "clang/Driver/Compilation.h"
3530
#include "clang/Driver/Driver.h"
36-
#include "clang/Driver/DriverDiagnostic.h"
3731
#include "clang/Driver/InputInfo.h"
3832
#include "clang/Driver/Job.h"
3933
#include "clang/Driver/Options.h"
@@ -54,13 +48,11 @@
5448
#include "llvm/Option/Option.h"
5549
#include "llvm/Support/CodeGen.h"
5650
#include "llvm/Support/Compression.h"
57-
#include "llvm/Support/Debug.h"
5851
#include "llvm/Support/ErrorHandling.h"
5952
#include "llvm/Support/FileSystem.h"
6053
#include "llvm/Support/Path.h"
6154
#include "llvm/Support/Process.h"
6255
#include "llvm/Support/Program.h"
63-
#include "llvm/Support/ScopedPrinter.h"
6456
#include "llvm/Support/Threading.h"
6557
#include "llvm/Support/VirtualFileSystem.h"
6658
#include "llvm/Support/YAMLParser.h"

clang/lib/Driver/ToolChains/Cuda.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,12 @@
1313
#include "clang/Driver/Compilation.h"
1414
#include "clang/Driver/Distro.h"
1515
#include "clang/Driver/Driver.h"
16-
#include "clang/Driver/DriverDiagnostic.h"
1716
#include "clang/Driver/InputInfo.h"
1817
#include "clang/Driver/Options.h"
1918
#include "llvm/ADT/StringExtras.h"
2019
#include "llvm/Config/llvm-config.h" // for LLVM_HOST_TRIPLE
2120
#include "llvm/Option/ArgList.h"
2221
#include "llvm/Support/FileSystem.h"
23-
#include "llvm/Support/FormatAdapters.h"
24-
#include "llvm/Support/FormatVariadic.h"
2522
#include "llvm/Support/Path.h"
2623
#include "llvm/Support/Process.h"
2724
#include "llvm/Support/Program.h"

clang/lib/Driver/ToolChains/Darwin.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,20 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "Darwin.h"
10-
#include "Arch/AArch64.h"
1110
#include "Arch/ARM.h"
1211
#include "CommonArgs.h"
1312
#include "clang/Basic/AlignedAllocation.h"
1413
#include "clang/Basic/ObjCRuntime.h"
1514
#include "clang/Config/config.h"
1615
#include "clang/Driver/Compilation.h"
1716
#include "clang/Driver/Driver.h"
18-
#include "clang/Driver/DriverDiagnostic.h"
1917
#include "clang/Driver/Options.h"
2018
#include "clang/Driver/SanitizerArgs.h"
2119
#include "llvm/ADT/StringSwitch.h"
2220
#include "llvm/Option/ArgList.h"
2321
#include "llvm/ProfileData/InstrProf.h"
2422
#include "llvm/ProfileData/MemProf.h"
2523
#include "llvm/Support/Path.h"
26-
#include "llvm/Support/ScopedPrinter.h"
2724
#include "llvm/Support/Threading.h"
2825
#include "llvm/Support/VirtualFileSystem.h"
2926
#include "llvm/TargetParser/TargetParser.h"

clang/lib/Driver/ToolChains/Flang.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include "clang/Basic/CodeGenOptions.h"
1414
#include "clang/Driver/Options.h"
1515
#include "llvm/Frontend/Debug/Options.h"
16-
#include "llvm/Support/FileSystem.h"
1716
#include "llvm/Support/Path.h"
1817
#include "llvm/TargetParser/Host.h"
1918
#include "llvm/TargetParser/RISCVISAInfo.h"

clang/lib/Driver/ToolChains/FreeBSD.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include "CommonArgs.h"
1414
#include "clang/Config/config.h"
1515
#include "clang/Driver/Compilation.h"
16-
#include "clang/Driver/DriverDiagnostic.h"
1716
#include "clang/Driver/Options.h"
1817
#include "clang/Driver/SanitizerArgs.h"
1918
#include "llvm/Option/ArgList.h"

clang/lib/Driver/ToolChains/Fuchsia.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,10 @@
1111
#include "clang/Config/config.h"
1212
#include "clang/Driver/Compilation.h"
1313
#include "clang/Driver/Driver.h"
14-
#include "clang/Driver/DriverDiagnostic.h"
1514
#include "clang/Driver/MultilibBuilder.h"
1615
#include "clang/Driver/Options.h"
1716
#include "clang/Driver/SanitizerArgs.h"
1817
#include "llvm/Option/ArgList.h"
19-
#include "llvm/ProfileData/InstrProf.h"
2018
#include "llvm/Support/FileSystem.h"
2119
#include "llvm/Support/Path.h"
2220
#include "llvm/Support/VirtualFileSystem.h"

clang/lib/Driver/ToolChains/Gnu.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@
1616
#include "Arch/Sparc.h"
1717
#include "Arch/SystemZ.h"
1818
#include "CommonArgs.h"
19-
#include "Linux.h"
2019
#include "clang/Config/config.h" // for GCC_INSTALL_PREFIX
2120
#include "clang/Driver/Compilation.h"
2221
#include "clang/Driver/Driver.h"
23-
#include "clang/Driver/DriverDiagnostic.h"
2422
#include "clang/Driver/MultilibBuilder.h"
2523
#include "clang/Driver/Options.h"
2624
#include "clang/Driver/Tool.h"

clang/lib/Driver/ToolChains/HIPAMD.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,11 @@
1212
#include "HIPUtility.h"
1313
#include "SPIRV.h"
1414
#include "clang/Basic/Cuda.h"
15-
#include "clang/Basic/TargetID.h"
1615
#include "clang/Driver/Compilation.h"
1716
#include "clang/Driver/Driver.h"
18-
#include "clang/Driver/DriverDiagnostic.h"
1917
#include "clang/Driver/InputInfo.h"
2018
#include "clang/Driver/Options.h"
2119
#include "clang/Driver/SanitizerArgs.h"
22-
#include "llvm/Support/Alignment.h"
2320
#include "llvm/Support/FileSystem.h"
2421
#include "llvm/Support/Path.h"
2522
#include "llvm/TargetParser/TargetParser.h"

clang/lib/Driver/ToolChains/HIPSPV.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include "HIPUtility.h"
1212
#include "clang/Driver/Compilation.h"
1313
#include "clang/Driver/Driver.h"
14-
#include "clang/Driver/DriverDiagnostic.h"
1514
#include "clang/Driver/InputInfo.h"
1615
#include "clang/Driver/Options.h"
1716
#include "llvm/Support/FileSystem.h"

clang/lib/Driver/ToolChains/HIPUtility.cpp

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

99
#include "HIPUtility.h"
10-
#include "Clang.h"
1110
#include "CommonArgs.h"
1211
#include "clang/Driver/Compilation.h"
1312
#include "clang/Driver/Options.h"

clang/lib/Driver/ToolChains/HLSL.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include "HLSL.h"
1010
#include "CommonArgs.h"
1111
#include "clang/Driver/Compilation.h"
12-
#include "clang/Driver/DriverDiagnostic.h"
1312
#include "clang/Driver/Job.h"
1413
#include "llvm/ADT/StringSwitch.h"
1514
#include "llvm/TargetParser/Triple.h"

clang/lib/Driver/ToolChains/Hexagon.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@
1010
#include "CommonArgs.h"
1111
#include "clang/Driver/Compilation.h"
1212
#include "clang/Driver/Driver.h"
13-
#include "clang/Driver/DriverDiagnostic.h"
1413
#include "clang/Driver/InputInfo.h"
1514
#include "clang/Driver/Options.h"
16-
#include "llvm/ADT/StringExtras.h"
1715
#include "llvm/Option/ArgList.h"
1816
#include "llvm/Support/FileSystem.h"
1917
#include "llvm/Support/Path.h"

0 commit comments

Comments
 (0)