Skip to content

Commit 920d277

Browse files
ZalatharZalathar
committed
Trim and tidy includes in rustc_llvm 
1 parent 44a056a commit 920d277

File tree

6 files changed

+53
-73
lines changed

6 files changed

+53
-73
lines changed

‎compiler/rustc_llvm/llvm-wrapper/CoverageMappingWrapper.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
#include "LLVMWrapper.h"
2+
23
#include "llvm/ADT/ArrayRef.h"
4+
#include "llvm/ADT/SmallVector.h"
5+
#include "llvm/ADT/StringRef.h"
6+
#include "llvm/IR/Module.h"
37
#include "llvm/ProfileData/Coverage/CoverageMapping.h"
48
#include "llvm/ProfileData/Coverage/CoverageMappingWriter.h"
59
#include "llvm/ProfileData/InstrProf.h"

‎compiler/rustc_llvm/llvm-wrapper/LLVMWrapper.h‎

Lines changed: 9 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,19 @@
1+
#ifndef INCLUDED_RUSTC_LLVM_LLVMWRAPPER_H
2+
#define INCLUDED_RUSTC_LLVM_LLVMWRAPPER_H
3+
14
#include "SuppressLLVMWarnings.h"
25

3-
#include "llvm-c/BitReader.h"
4-
#include "llvm-c/Core.h"
5-
#include "llvm-c/Object.h"
6-
#include "llvm/ADT/ArrayRef.h"
7-
#include "llvm/ADT/DenseSet.h"
8-
#include "llvm/ADT/SmallVector.h"
9-
#include "llvm/Analysis/Lint.h"
10-
#include "llvm/Analysis/Passes.h"
11-
#include "llvm/IR/IRBuilder.h"
12-
#include "llvm/IR/InlineAsm.h"
13-
#include "llvm/IR/LLVMContext.h"
14-
#include "llvm/IR/Module.h"
15-
#include "llvm/Support/CommandLine.h"
16-
#include "llvm/Support/Debug.h"
17-
#include "llvm/Support/DynamicLibrary.h"
18-
#include "llvm/Support/FormattedStream.h"
19-
#include "llvm/Support/JSON.h"
20-
#include "llvm/Support/Memory.h"
21-
#include "llvm/Support/SourceMgr.h"
22-
#include "llvm/Support/TargetSelect.h"
23-
#include "llvm/Support/Timer.h"
24-
#include "llvm/Support/raw_ostream.h"
25-
#include "llvm/Target/TargetMachine.h"
26-
#include "llvm/Target/TargetOptions.h"
27-
#include "llvm/Transforms/IPO.h"
28-
#include "llvm/Transforms/Scalar.h"
6+
#include "llvm/Config/llvm-config.h" // LLVM_VERSION_MAJOR, LLVM_VERSION_MINOR
7+
#include "llvm/Support/raw_ostream.h" // llvm::raw_ostream
8+
#include <cstddef> // size_t etc
9+
#include <cstdint> // uint64_t etc
2910

3011
#define LLVM_VERSION_GE(major, minor) \
3112
(LLVM_VERSION_MAJOR > (major) || \
3213
LLVM_VERSION_MAJOR == (major) && LLVM_VERSION_MINOR >= (minor))
3314

3415
#define LLVM_VERSION_LT(major, minor) (!LLVM_VERSION_GE((major), (minor)))
3516

36-
#if LLVM_VERSION_GE(20, 0)
37-
#include "llvm/Transforms/Utils/Instrumentation.h"
38-
#else
39-
#include "llvm/Transforms/Instrumentation.h"
40-
#endif
41-
42-
#include "llvm/IR/LegacyPassManager.h"
43-
44-
#include "llvm/Bitcode/BitcodeReader.h"
45-
#include "llvm/Bitcode/BitcodeWriter.h"
46-
47-
#include "llvm/IR/DIBuilder.h"
48-
#include "llvm/IR/DebugInfo.h"
49-
#include "llvm/IR/IRPrintingPasses.h"
50-
#include "llvm/Linker/Linker.h"
51-
52-
#include "llvm/TargetParser/Triple.h"
53-
5417
extern "C" void LLVMRustSetLastError(const char *);
5518

5619
enum class LLVMRustResult { Success, Failure };
@@ -81,3 +44,5 @@ class RawRustStringOstream : public llvm::raw_ostream {
8144
flush();
8245
}
8346
};
47+
48+
#endif // INCLUDED_RUSTC_LLVM_LLVMWRAPPER_H

‎compiler/rustc_llvm/llvm-wrapper/Linker.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
#include "llvm/Linker/Linker.h"
2-
#include "SuppressLLVMWarnings.h"
3-
41
#include "LLVMWrapper.h"
52

3+
#include "llvm/Bitcode/BitcodeReader.h"
4+
#include "llvm/IR/Module.h"
5+
#include "llvm/Linker/Linker.h"
6+
#include "llvm/Support/MemoryBuffer.h"
7+
68
using namespace llvm;
79

810
struct RustLinker {

‎compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,21 @@
1-
#include <stdio.h>
2-
3-
#include <cstddef>
4-
#include <iomanip>
5-
#include <set>
6-
#include <vector>
7-
81
#include "LLVMWrapper.h"
92

10-
#include "llvm/Analysis/AliasAnalysis.h"
3+
#include "llvm-c/Core.h"
4+
#include "llvm/ADT/ArrayRef.h"
5+
#include "llvm/ADT/DenseSet.h"
6+
#include "llvm/ADT/SmallVector.h"
7+
#include "llvm/Analysis/Lint.h"
118
#include "llvm/Analysis/TargetLibraryInfo.h"
12-
#include "llvm/Analysis/TargetTransformInfo.h"
139
#include "llvm/Bitcode/BitcodeWriter.h"
1410
#include "llvm/CodeGen/CommandFlags.h"
15-
#include "llvm/CodeGen/TargetSubtargetInfo.h"
1611
#include "llvm/IR/AssemblyAnnotationWriter.h"
1712
#include "llvm/IR/AutoUpgrade.h"
18-
#include "llvm/IR/IntrinsicInst.h"
13+
#include "llvm/IR/LegacyPassManager.h"
14+
#include "llvm/IR/PassManager.h"
1915
#include "llvm/IR/Verifier.h"
2016
#include "llvm/LTO/LTO.h"
17+
#include "llvm/MC/MCSubtargetInfo.h"
2118
#include "llvm/MC/TargetRegistry.h"
22-
#include "llvm/Object/IRObjectFile.h"
2319
#include "llvm/Object/ObjectFile.h"
2420
#include "llvm/Passes/PassBuilder.h"
2521
#include "llvm/Passes/PassPlugin.h"
@@ -30,25 +26,28 @@
3026
#include "llvm/Support/VirtualFileSystem.h"
3127
#include "llvm/Target/TargetMachine.h"
3228
#include "llvm/TargetParser/Host.h"
33-
#include "llvm/Transforms/IPO/AlwaysInliner.h"
3429
#include "llvm/Transforms/IPO/FunctionImport.h"
3530
#include "llvm/Transforms/IPO/Internalize.h"
3631
#include "llvm/Transforms/IPO/LowerTypeTests.h"
3732
#include "llvm/Transforms/IPO/ThinLTOBitcodeWriter.h"
3833
#include "llvm/Transforms/Instrumentation/AddressSanitizer.h"
3934
#include "llvm/Transforms/Instrumentation/DataFlowSanitizer.h"
40-
#include "llvm/Transforms/Utils/AddDiscriminators.h"
41-
#include "llvm/Transforms/Utils/FunctionImportUtils.h"
42-
#if LLVM_VERSION_GE(19, 0)
43-
#include "llvm/Support/PGOOptions.h"
44-
#endif
4535
#include "llvm/Transforms/Instrumentation/HWAddressSanitizer.h"
4636
#include "llvm/Transforms/Instrumentation/InstrProfiling.h"
4737
#include "llvm/Transforms/Instrumentation/MemorySanitizer.h"
4838
#include "llvm/Transforms/Instrumentation/ThreadSanitizer.h"
49-
#include "llvm/Transforms/Utils.h"
5039
#include "llvm/Transforms/Utils/CanonicalizeAliases.h"
40+
#include "llvm/Transforms/Utils/FunctionImportUtils.h"
5141
#include "llvm/Transforms/Utils/NameAnonGlobals.h"
42+
#include <set>
43+
#include <string>
44+
#include <vector>
45+
46+
// Conditional includes prevent clang-format from fully sorting the list,
47+
// so keep them separate.
48+
#if LLVM_VERSION_GE(19, 0)
49+
#include "llvm/Support/PGOOptions.h"
50+
#endif
5251

5352
using namespace llvm;
5453

‎compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,38 @@
11
#include "LLVMWrapper.h"
2+
3+
#include "llvm-c/Core.h"
4+
#include "llvm/ADT/ArrayRef.h"
5+
#include "llvm/ADT/SmallVector.h"
26
#include "llvm/ADT/Statistic.h"
7+
#include "llvm/ADT/StringRef.h"
8+
#include "llvm/BinaryFormat/Magic.h"
39
#include "llvm/Bitcode/BitcodeWriter.h"
10+
#include "llvm/IR/DIBuilder.h"
411
#include "llvm/IR/DebugInfoMetadata.h"
512
#include "llvm/IR/DiagnosticHandler.h"
613
#include "llvm/IR/DiagnosticInfo.h"
714
#include "llvm/IR/DiagnosticPrinter.h"
815
#include "llvm/IR/GlobalVariable.h"
16+
#include "llvm/IR/IRBuilder.h"
17+
#include "llvm/IR/InlineAsm.h"
918
#include "llvm/IR/Instructions.h"
10-
#include "llvm/IR/Intrinsics.h"
1119
#include "llvm/IR/IntrinsicsARM.h"
20+
#include "llvm/IR/LLVMContext.h"
1221
#include "llvm/IR/LLVMRemarkStreamer.h"
1322
#include "llvm/IR/Mangler.h"
23+
#include "llvm/IR/Module.h"
1424
#include "llvm/IR/Value.h"
15-
#include "llvm/Object/Archive.h"
1625
#include "llvm/Object/COFFImportFile.h"
17-
#include "llvm/Object/ObjectFile.h"
18-
#include "llvm/Pass.h"
1926
#include "llvm/Remarks/RemarkFormat.h"
2027
#include "llvm/Remarks/RemarkSerializer.h"
2128
#include "llvm/Remarks/RemarkStreamer.h"
29+
#include "llvm/Support/Compression.h"
30+
#include "llvm/Support/FileSystem.h"
31+
#include "llvm/Support/JSON.h"
2232
#include "llvm/Support/ModRef.h"
2333
#include "llvm/Support/Signals.h"
34+
#include "llvm/Support/Timer.h"
2435
#include "llvm/Support/ToolOutputFile.h"
25-
2636
#include <iostream>
2737

2838
// for raw `write` in the bad-alloc handler

‎compiler/rustc_llvm/llvm-wrapper/SymbolWrapper.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
// * https://github.com/llvm/llvm-project/blob/ef6d1ec07c693352c4a60dd58db08d2d8558f6ea/llvm/lib/Object/ArchiveWriter.cpp
99

1010
#include "LLVMWrapper.h"
11-
#include "SuppressLLVMWarnings.h"
11+
1212
#include "llvm/ADT/SmallString.h"
1313
#include "llvm/IR/LLVMContext.h"
1414
#include "llvm/Object/COFF.h"
1515
#include "llvm/Object/COFFImportFile.h"
1616
#include "llvm/Object/IRObjectFile.h"
1717
#include "llvm/Object/ObjectFile.h"
18-
#include <llvm/Support/raw_ostream.h>
18+
#include "llvm/Support/raw_ostream.h"
1919

2020
using namespace llvm;
2121
using namespace llvm::sys;

0 commit comments

Comments
 (0)