Skip to content

Commit 0694353

Browse files
author
serge-sans-paille
committed
Cleanup MCParser headers
As usual with that header cleanup series, some implicit dependencies now need to be explicit: llvm/MC/MCParser/MCAsmParser.h no longer includes llvm/MC/MCParser/MCAsmLexer.h Preprocessed lines to build llvm on my setup: after: 1068185081 before: 1068324320 So no compile time benefit to expect, but we still get the looser coupling between files which is great. Discourse thread: https://discourse.llvm.org/t/include-what-you-use-include-cleanup Differential Revision: https://reviews.llvm.org/D119359
1 parent 1bf7921 commit 0694353

File tree

27 files changed

+23
-49
lines changed

27 files changed

+23
-49
lines changed

‎llvm/include/llvm/MC/MCParser/MCAsmLexer.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@
1212
#include "llvm/ADT/ArrayRef.h"
1313
#include "llvm/ADT/SmallVector.h"
1414
#include "llvm/MC/MCAsmMacro.h"
15-
#include <algorithm>
1615
#include <cassert>
1716
#include <cstddef>
18-
#include <cstdint>
1917
#include <string>
2018

2119
namespace llvm {

‎llvm/include/llvm/MC/MCParser/MCAsmParser.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@
1010
#define LLVM_MC_MCPARSER_MCASMPARSER_H
1111

1212
#include "llvm/ADT/None.h"
13-
#include "llvm/ADT/STLExtras.h"
13+
#include "llvm/ADT/STLFunctionalExtras.h"
1414
#include "llvm/ADT/SmallString.h"
1515
#include "llvm/ADT/SmallVector.h"
1616
#include "llvm/ADT/StringRef.h"
1717
#include "llvm/ADT/Twine.h"
18-
#include "llvm/MC/MCParser/MCAsmLexer.h"
18+
#include "llvm/MC/MCAsmMacro.h"
1919
#include "llvm/Support/SMLoc.h"
2020
#include <cstdint>
21-
#include <ctime>
2221
#include <string>
2322
#include <utility>
2423

2524
namespace llvm {
2625

26+
class MCAsmLexer;
2727
class MCAsmInfo;
2828
class MCAsmParserExtension;
2929
class MCContext;

‎llvm/include/llvm/MC/MCParser/MCAsmParserExtension.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@
99
#ifndef LLVM_MC_MCPARSER_MCASMPARSEREXTENSION_H
1010
#define LLVM_MC_MCPARSER_MCASMPARSEREXTENSION_H
1111

12-
#include "llvm/ADT/STLExtras.h"
12+
#include "llvm/ADT/STLFunctionalExtras.h"
1313
#include "llvm/ADT/StringRef.h"
14-
#include "llvm/MC/MCParser/MCAsmLexer.h"
1514
#include "llvm/MC/MCParser/MCAsmParser.h"
1615
#include "llvm/Support/SMLoc.h"
1716

‎llvm/include/llvm/MC/MCParser/MCTargetAsmParser.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@
1111

1212
#include "llvm/ADT/StringRef.h"
1313
#include "llvm/MC/MCExpr.h"
14-
#include "llvm/MC/MCInstrInfo.h"
15-
#include "llvm/MC/MCParser/MCAsmLexer.h"
16-
#include "llvm/MC/MCParser/MCParsedAsmOperand.h"
1714
#include "llvm/MC/MCParser/MCAsmParserExtension.h"
15+
#include "llvm/MC/MCParser/MCParsedAsmOperand.h"
1816
#include "llvm/MC/MCTargetOptions.h"
1917
#include "llvm/MC/SubtargetFeature.h"
2018
#include "llvm/Support/SMLoc.h"
@@ -23,9 +21,12 @@
2321

2422
namespace llvm {
2523

24+
class MCContext;
2625
class MCInst;
26+
class MCInstrInfo;
2727
class MCStreamer;
2828
class MCSubtargetInfo;
29+
class MCSymbol;
2930
template <typename T> class SmallVectorImpl;
3031

3132
using OperandVector = SmallVectorImpl<std::unique_ptr<MCParsedAsmOperand>>;

‎llvm/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include "llvm/IR/LLVMContext.h"
2727
#include "llvm/IR/Module.h"
2828
#include "llvm/MC/MCAsmInfo.h"
29+
#include "llvm/MC/MCParser/MCAsmLexer.h"
2930
#include "llvm/MC/MCParser/MCTargetAsmParser.h"
3031
#include "llvm/MC/MCStreamer.h"
3132
#include "llvm/MC/MCSubtargetInfo.h"

‎llvm/lib/MC/MCParser/AsmParser.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#include "llvm/MC/MCInstPrinter.h"
3434
#include "llvm/MC/MCInstrDesc.h"
3535
#include "llvm/MC/MCInstrInfo.h"
36-
#include "llvm/MC/MCObjectFileInfo.h"
3736
#include "llvm/MC/MCParser/AsmCond.h"
3837
#include "llvm/MC/MCParser/AsmLexer.h"
3938
#include "llvm/MC/MCParser/MCAsmLexer.h"

‎llvm/lib/MC/MCParser/COFFAsmParser.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,8 @@
1313
#include "llvm/BinaryFormat/COFF.h"
1414
#include "llvm/MC/MCContext.h"
1515
#include "llvm/MC/MCDirectives.h"
16-
#include "llvm/MC/MCObjectFileInfo.h"
1716
#include "llvm/MC/MCParser/MCAsmLexer.h"
1817
#include "llvm/MC/MCParser/MCAsmParserExtension.h"
19-
#include "llvm/MC/MCParser/MCTargetAsmParser.h"
20-
#include "llvm/MC/MCRegisterInfo.h"
2118
#include "llvm/MC/MCSectionCOFF.h"
2219
#include "llvm/MC/MCStreamer.h"
2320
#include "llvm/MC/SectionKind.h"

‎llvm/lib/MC/MCParser/COFFMasmParser.cpp

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

99
#include "llvm/ADT/StringRef.h"
10-
#include "llvm/ADT/Triple.h"
1110
#include "llvm/ADT/Twine.h"
1211
#include "llvm/BinaryFormat/COFF.h"
1312
#include "llvm/MC/MCContext.h"
14-
#include "llvm/MC/MCDirectives.h"
15-
#include "llvm/MC/MCObjectFileInfo.h"
1613
#include "llvm/MC/MCParser/MCAsmLexer.h"
1714
#include "llvm/MC/MCParser/MCAsmParserExtension.h"
18-
#include "llvm/MC/MCParser/MCAsmParserUtils.h"
19-
#include "llvm/MC/MCParser/MCTargetAsmParser.h"
20-
#include "llvm/MC/MCRegisterInfo.h"
2115
#include "llvm/MC/MCSectionCOFF.h"
2216
#include "llvm/MC/MCStreamer.h"
2317
#include "llvm/MC/MCSymbolCOFF.h"
2418
#include "llvm/MC/SectionKind.h"
2519
#include "llvm/Support/Casting.h"
2620
#include "llvm/Support/SMLoc.h"
27-
#include <cassert>
2821
#include <cstdint>
29-
#include <limits>
3022
#include <utility>
3123

3224
using namespace llvm;

‎llvm/lib/MC/MCParser/DarwinAsmParser.cpp

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

9-
#include "llvm/ADT/STLExtras.h"
109
#include "llvm/ADT/SmallVector.h"
1110
#include "llvm/ADT/StringRef.h"
1211
#include "llvm/ADT/StringSwitch.h"
@@ -15,7 +14,6 @@
1514
#include "llvm/BinaryFormat/MachO.h"
1615
#include "llvm/MC/MCContext.h"
1716
#include "llvm/MC/MCDirectives.h"
18-
#include "llvm/MC/MCObjectFileInfo.h"
1917
#include "llvm/MC/MCParser/MCAsmLexer.h"
2018
#include "llvm/MC/MCParser/MCAsmParser.h"
2119
#include "llvm/MC/MCParser/MCAsmParserExtension.h"
@@ -29,7 +27,6 @@
2927
#include "llvm/Support/SMLoc.h"
3028
#include "llvm/Support/SourceMgr.h"
3129
#include "llvm/Support/raw_ostream.h"
32-
#include <algorithm>
3330
#include <cstddef>
3431
#include <cstdint>
3532
#include <string>

‎llvm/lib/MC/MCParser/ELFAsmParser.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,9 @@
1212
#include "llvm/MC/MCAsmInfo.h"
1313
#include "llvm/MC/MCContext.h"
1414
#include "llvm/MC/MCDirectives.h"
15-
#include "llvm/MC/MCExpr.h"
1615
#include "llvm/MC/MCParser/MCAsmLexer.h"
1716
#include "llvm/MC/MCParser/MCAsmParser.h"
1817
#include "llvm/MC/MCParser/MCAsmParserExtension.h"
19-
#include "llvm/MC/MCSection.h"
2018
#include "llvm/MC/MCSectionELF.h"
2119
#include "llvm/MC/MCStreamer.h"
2220
#include "llvm/MC/MCSymbol.h"

‎llvm/lib/MC/MCParser/GOFFAsmParser.cpp

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

99
#include "llvm/ADT/StringSwitch.h"
10-
#include "llvm/ADT/Twine.h"
11-
#include "llvm/MC/MCAsmInfo.h"
12-
#include "llvm/MC/MCContext.h"
13-
#include "llvm/MC/MCExpr.h"
14-
#include "llvm/MC/MCParser/MCAsmLexer.h"
1510
#include "llvm/MC/MCParser/MCAsmParserExtension.h"
16-
#include "llvm/MC/MCSectionGOFF.h"
17-
#include "llvm/MC/MCStreamer.h"
18-
#include "llvm/MC/MCSymbolGOFF.h"
1911

2012
using namespace llvm;
2113

‎llvm/lib/MC/MCParser/MCAsmParserExtension.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "llvm/MC/MCParser/MCAsmParserExtension.h"
1010
#include "llvm/MC/MCContext.h"
1111
#include "llvm/MC/MCExpr.h"
12+
#include "llvm/MC/MCParser/MCAsmLexer.h"
1213
#include "llvm/MC/MCStreamer.h"
1314

1415
using namespace llvm;

‎llvm/lib/MC/MCParser/MasmParser.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include "llvm/ADT/APInt.h"
1515
#include "llvm/ADT/ArrayRef.h"
1616
#include "llvm/ADT/BitVector.h"
17-
#include "llvm/ADT/DenseMap.h"
1817
#include "llvm/ADT/None.h"
1918
#include "llvm/ADT/Optional.h"
2019
#include "llvm/ADT/STLExtras.h"
@@ -36,13 +35,11 @@
3635
#include "llvm/MC/MCInstPrinter.h"
3736
#include "llvm/MC/MCInstrDesc.h"
3837
#include "llvm/MC/MCInstrInfo.h"
39-
#include "llvm/MC/MCObjectFileInfo.h"
4038
#include "llvm/MC/MCParser/AsmCond.h"
4139
#include "llvm/MC/MCParser/AsmLexer.h"
4240
#include "llvm/MC/MCParser/MCAsmLexer.h"
4341
#include "llvm/MC/MCParser/MCAsmParser.h"
4442
#include "llvm/MC/MCParser/MCAsmParserExtension.h"
45-
#include "llvm/MC/MCParser/MCAsmParserUtils.h"
4643
#include "llvm/MC/MCParser/MCParsedAsmOperand.h"
4744
#include "llvm/MC/MCParser/MCTargetAsmParser.h"
4845
#include "llvm/MC/MCRegisterInfo.h"
@@ -51,7 +48,6 @@
5148
#include "llvm/MC/MCSubtargetInfo.h"
5249
#include "llvm/MC/MCSymbol.h"
5350
#include "llvm/MC/MCTargetOptions.h"
54-
#include "llvm/MC/MCValue.h"
5551
#include "llvm/Support/Casting.h"
5652
#include "llvm/Support/CommandLine.h"
5753
#include "llvm/Support/ErrorHandling.h"
@@ -65,7 +61,6 @@
6561
#include "llvm/Support/raw_ostream.h"
6662
#include <algorithm>
6763
#include <cassert>
68-
#include <cctype>
6964
#include <climits>
7065
#include <cstddef>
7166
#include <cstdint>

‎llvm/lib/MC/MCParser/WasmAsmParser.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,8 @@
2323
#include "llvm/MC/MCParser/MCAsmParserExtension.h"
2424
#include "llvm/MC/MCSectionWasm.h"
2525
#include "llvm/MC/MCStreamer.h"
26-
#include "llvm/MC/MCSymbol.h"
2726
#include "llvm/MC/MCSymbolWasm.h"
2827
#include "llvm/Support/Casting.h"
29-
#include "llvm/Support/MachineValueType.h"
3028

3129
using namespace llvm;
3230

‎llvm/lib/MC/MCParser/XCOFFAsmParser.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,8 @@
88
//===----------------------------------------------------------------------===//
99

1010
#include "llvm/BinaryFormat/XCOFF.h"
11-
#include "llvm/MC/MCContext.h"
12-
#include "llvm/MC/MCParser/MCAsmLexer.h"
1311
#include "llvm/MC/MCParser/MCAsmParser.h"
1412
#include "llvm/MC/MCParser/MCAsmParserExtension.h"
15-
#include "llvm/MC/MCSectionXCOFF.h"
16-
#include "llvm/MC/MCStreamer.h"
17-
#include "llvm/MC/MCSymbol.h"
18-
#include "llvm/MC/MCSymbolXCOFF.h"
19-
#include "llvm/Support/MachineValueType.h"
2013

2114
using namespace llvm;
2215

‎llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "llvm/MC/MCContext.h"
2626
#include "llvm/MC/MCExpr.h"
2727
#include "llvm/MC/MCInst.h"
28+
#include "llvm/MC/MCParser/MCAsmLexer.h"
2829
#include "llvm/MC/MCParser/MCAsmParser.h"
2930
#include "llvm/MC/MCParser/MCParsedAsmOperand.h"
3031
#include "llvm/MC/MCParser/MCTargetAsmParser.h"

‎llvm/lib/Target/BPF/AsmParser/BPFAsmParser.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include "llvm/MC/MCContext.h"
1414
#include "llvm/MC/MCExpr.h"
1515
#include "llvm/MC/MCInst.h"
16+
#include "llvm/MC/MCInstrInfo.h"
1617
#include "llvm/MC/MCParser/MCAsmLexer.h"
1718
#include "llvm/MC/MCParser/MCParsedAsmOperand.h"
1819
#include "llvm/MC/MCParser/MCTargetAsmParser.h"

‎llvm/lib/Target/MSP430/AsmParser/MSP430AsmParser.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include "llvm/MC/MCExpr.h"
1717
#include "llvm/MC/MCInst.h"
1818
#include "llvm/MC/MCInstBuilder.h"
19+
#include "llvm/MC/MCInstrInfo.h"
1920
#include "llvm/MC/MCParser/MCAsmLexer.h"
2021
#include "llvm/MC/MCParser/MCParsedAsmOperand.h"
2122
#include "llvm/MC/MCParser/MCTargetAsmParser.h"

‎llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "llvm/MC/MCExpr.h"
2626
#include "llvm/MC/MCInst.h"
2727
#include "llvm/MC/MCInstrDesc.h"
28+
#include "llvm/MC/MCInstrInfo.h"
2829
#include "llvm/MC/MCObjectFileInfo.h"
2930
#include "llvm/MC/MCParser/MCAsmLexer.h"
3031
#include "llvm/MC/MCParser/MCAsmParser.h"

‎llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "llvm/MC/MCExpr.h"
2525
#include "llvm/MC/MCInst.h"
2626
#include "llvm/MC/MCInstBuilder.h"
27+
#include "llvm/MC/MCInstrInfo.h"
2728
#include "llvm/MC/MCObjectFileInfo.h"
2829
#include "llvm/MC/MCParser/MCAsmLexer.h"
2930
#include "llvm/MC/MCParser/MCParsedAsmOperand.h"

‎llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include "llvm/MC/MCContext.h"
1717
#include "llvm/MC/MCExpr.h"
1818
#include "llvm/MC/MCInst.h"
19+
#include "llvm/MC/MCInstrInfo.h"
1920
#include "llvm/MC/MCObjectFileInfo.h"
2021
#include "llvm/MC/MCParser/MCAsmLexer.h"
2122
#include "llvm/MC/MCParser/MCAsmParser.h"

‎llvm/lib/Target/SystemZ/AsmParser/SystemZAsmParser.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "llvm/MC/MCExpr.h"
2020
#include "llvm/MC/MCInst.h"
2121
#include "llvm/MC/MCInstBuilder.h"
22+
#include "llvm/MC/MCInstrInfo.h"
2223
#include "llvm/MC/MCParser/MCAsmLexer.h"
2324
#include "llvm/MC/MCParser/MCAsmParser.h"
2425
#include "llvm/MC/MCParser/MCAsmParserExtension.h"

‎llvm/lib/Target/VE/AsmParser/VEAsmParser.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "llvm/MC/MCContext.h"
1818
#include "llvm/MC/MCExpr.h"
1919
#include "llvm/MC/MCInst.h"
20+
#include "llvm/MC/MCInstrInfo.h"
2021
#include "llvm/MC/MCParser/MCAsmLexer.h"
2122
#include "llvm/MC/MCParser/MCAsmParser.h"
2223
#include "llvm/MC/MCParser/MCParsedAsmOperand.h"

‎llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmParser.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "llvm/MC/MCExpr.h"
2525
#include "llvm/MC/MCInst.h"
2626
#include "llvm/MC/MCInstrInfo.h"
27+
#include "llvm/MC/MCParser/MCAsmLexer.h"
2728
#include "llvm/MC/MCParser/MCParsedAsmOperand.h"
2829
#include "llvm/MC/MCParser/MCTargetAsmParser.h"
2930
#include "llvm/MC/MCSectionWasm.h"

‎llvm/tools/llvm-exegesis/lib/SnippetFile.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include "llvm/MC/MCContext.h"
1212
#include "llvm/MC/MCInstPrinter.h"
1313
#include "llvm/MC/MCObjectFileInfo.h"
14+
#include "llvm/MC/MCParser/MCAsmLexer.h"
1415
#include "llvm/MC/MCParser/MCAsmParser.h"
1516
#include "llvm/MC/MCParser/MCTargetAsmParser.h"
1617
#include "llvm/MC/MCRegisterInfo.h"

‎llvm/tools/llvm-mca/CodeRegionGenerator.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include "CodeRegionGenerator.h"
1717
#include "llvm/ADT/ArrayRef.h"
1818
#include "llvm/ADT/StringRef.h"
19+
#include "llvm/MC/MCParser/MCAsmLexer.h"
1920
#include "llvm/MC/MCParser/MCTargetAsmParser.h"
2021
#include "llvm/MC/MCStreamer.h"
2122
#include "llvm/MC/MCTargetOptions.h"

‎llvm/unittests/MC/SystemZ/SystemZAsmLexerTest.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
//===--------------------------------------------------------------------===//
88
#include "llvm/MC/MCAsmInfo.h"
99
#include "llvm/MC/MCContext.h"
10+
#include "llvm/MC/MCInstrInfo.h"
1011
#include "llvm/MC/MCObjectFileInfo.h"
12+
#include "llvm/MC/MCParser/MCAsmLexer.h"
1113
#include "llvm/MC/MCParser/MCTargetAsmParser.h"
1214
#include "llvm/MC/MCRegisterInfo.h"
1315
#include "llvm/MC/MCStreamer.h"

0 commit comments

Comments
 (0)