Skip to content
This repository was archived by the owner on Nov 1, 2021. It is now read-only.

Commit 1b27914

Browse files
committed
[cleanup] Re-sort all the #include lines in LLVM using
utils/sort_includes.py. I clearly haven't done this in a while, so more changed than usual. This even uncovered a missing include from the InstrProf library that I've added. No functionality changed here, just mechanical cleanup of the include order. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@225974 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent fd06dd8 commit 1b27914

File tree

196 files changed

+233
-288
lines changed

Some content is hidden

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

196 files changed

+233
-288
lines changed

Diff for: include/llvm/ADT/DepthFirstIterator.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
#ifndef LLVM_ADT_DEPTHFIRSTITERATOR_H
3434
#define LLVM_ADT_DEPTHFIRSTITERATOR_H
3535

36-
#include "llvm/ADT/iterator_range.h"
3736
#include "llvm/ADT/GraphTraits.h"
3837
#include "llvm/ADT/PointerIntPair.h"
3938
#include "llvm/ADT/SmallPtrSet.h"
39+
#include "llvm/ADT/iterator_range.h"
4040
#include <set>
4141
#include <vector>
4242

Diff for: include/llvm/ADT/iterator.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#ifndef LLVM_ADT_ITERATOR_H
1111
#define LLVM_ADT_ITERATOR_H
1212

13-
#include <iterator>
1413
#include <cstddef>
14+
#include <iterator>
1515

1616
namespace llvm {
1717

Diff for: include/llvm/Analysis/CGSCCPassManager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
#ifndef LLVM_ANALYSIS_CGSCCPASSMANAGER_H
2222
#define LLVM_ANALYSIS_CGSCCPASSMANAGER_H
2323

24-
#include "llvm/IR/PassManager.h"
2524
#include "llvm/Analysis/LazyCallGraph.h"
25+
#include "llvm/IR/PassManager.h"
2626

2727
namespace llvm {
2828

Diff for: include/llvm/Analysis/FunctionTargetTransformInfo.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
#ifndef LLVM_ANALYSIS_FUNCTIONTARGETTRANSFORMINFO_H
1717
#define LLVM_ANALYSIS_FUNCTIONTARGETTRANSFORMINFO_H
1818

19-
#include "llvm/Pass.h"
2019
#include "TargetTransformInfo.h"
20+
#include "llvm/Pass.h"
2121

2222
namespace llvm {
2323
class FunctionTargetTransformInfo final : public FunctionPass {

Diff for: include/llvm/Analysis/JumpInstrTableInfo.h

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
#include "llvm/ADT/DenseMap.h"
1818
#include "llvm/Pass.h"
19-
2019
#include <vector>
2120

2221
namespace llvm {

Diff for: include/llvm/Analysis/RegionInfoImpl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
#ifndef LLVM_ANALYSIS_REGIONINFOIMPL_H
1313
#define LLVM_ANALYSIS_REGIONINFOIMPL_H
1414

15-
#include "llvm/Analysis/RegionInfo.h"
1615
#include "llvm/ADT/PostOrderIterator.h"
1716
#include "llvm/Analysis/DominanceFrontier.h"
1817
#include "llvm/Analysis/LoopInfo.h"
1918
#include "llvm/Analysis/PostDominators.h"
19+
#include "llvm/Analysis/RegionInfo.h"
2020
#include "llvm/Analysis/RegionIterator.h"
2121
#include "llvm/Support/CommandLine.h"
2222
#include "llvm/Support/Debug.h"

Diff for: include/llvm/Analysis/ScalarEvolutionExpressions.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#ifndef LLVM_ANALYSIS_SCALAREVOLUTIONEXPRESSIONS_H
1515
#define LLVM_ANALYSIS_SCALAREVOLUTIONEXPRESSIONS_H
1616

17-
#include "llvm/ADT/iterator_range.h"
1817
#include "llvm/ADT/SmallPtrSet.h"
18+
#include "llvm/ADT/iterator_range.h"
1919
#include "llvm/Analysis/ScalarEvolution.h"
2020
#include "llvm/Support/ErrorHandling.h"
2121

Diff for: include/llvm/CodeGen/FastISel.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
#include "llvm/ADT/DenseMap.h"
1919
#include "llvm/CodeGen/CallingConvLower.h"
2020
#include "llvm/CodeGen/MachineBasicBlock.h"
21-
#include "llvm/Target/TargetLowering.h"
2221
#include "llvm/IR/CallingConv.h"
2322
#include "llvm/IR/IntrinsicInst.h"
23+
#include "llvm/Target/TargetLowering.h"
2424

2525
namespace llvm {
2626

Diff for: include/llvm/CodeGen/ForwardControlFlowIntegrity.h

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include "llvm/ADT/SmallVector.h"
1919
#include "llvm/Pass.h"
2020
#include "llvm/Target/TargetOptions.h"
21-
2221
#include <string>
2322

2423
namespace llvm {

Diff for: include/llvm/CodeGen/FunctionLoweringInfo.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#include "llvm/ADT/IndexedMap.h"
2121
#include "llvm/ADT/SmallPtrSet.h"
2222
#include "llvm/ADT/SmallVector.h"
23-
#include "llvm/CodeGen/MachineBasicBlock.h"
2423
#include "llvm/CodeGen/ISDOpcodes.h"
24+
#include "llvm/CodeGen/MachineBasicBlock.h"
2525
#include "llvm/IR/InlineAsm.h"
2626
#include "llvm/IR/Instructions.h"
2727
#include "llvm/Target/TargetRegisterInfo.h"

Diff for: include/llvm/CodeGen/GCMetadata.h

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
#include "llvm/ADT/StringMap.h"
3838
#include "llvm/IR/DebugLoc.h"
3939
#include "llvm/Pass.h"
40-
4140
#include <memory>
4241

4342
namespace llvm {

Diff for: include/llvm/CodeGen/LexicalScopes.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919

2020
#include "llvm/ADT/ArrayRef.h"
2121
#include "llvm/ADT/DenseMap.h"
22+
#include "llvm/ADT/STLExtras.h"
2223
#include "llvm/ADT/SmallPtrSet.h"
2324
#include "llvm/ADT/SmallVector.h"
24-
#include "llvm/ADT/STLExtras.h"
2525
#include "llvm/IR/DebugLoc.h"
2626
#include "llvm/IR/Metadata.h"
2727
#include "llvm/IR/ValueHandle.h"
28-
#include <utility>
2928
#include <unordered_map>
29+
#include <utility>
3030
namespace llvm {
3131

3232
class MachineInstr;

Diff for: include/llvm/CodeGen/MachineScheduler.h

-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
#include "llvm/CodeGen/MachinePassRegistry.h"
8181
#include "llvm/CodeGen/RegisterPressure.h"
8282
#include "llvm/CodeGen/ScheduleDAGInstrs.h"
83-
8483
#include <memory>
8584

8685
namespace llvm {

Diff for: include/llvm/CodeGen/RegAllocPBQP.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
#define LLVM_CODEGEN_REGALLOCPBQP_H
1818

1919
#include "llvm/CodeGen/MachineFunctionPass.h"
20-
#include "llvm/CodeGen/PBQPRAConstraint.h"
2120
#include "llvm/CodeGen/PBQP/CostAllocator.h"
2221
#include "llvm/CodeGen/PBQP/ReductionRules.h"
22+
#include "llvm/CodeGen/PBQPRAConstraint.h"
2323
#include "llvm/Support/ErrorHandling.h"
2424

2525
namespace llvm {

Diff for: include/llvm/CodeGen/SelectionDAGISel.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#include "llvm/CodeGen/MachineFunctionPass.h"
1919
#include "llvm/CodeGen/SelectionDAG.h"
2020
#include "llvm/IR/BasicBlock.h"
21-
#include "llvm/Target/TargetSubtargetInfo.h"
2221
#include "llvm/Pass.h"
22+
#include "llvm/Target/TargetSubtargetInfo.h"
2323

2424
namespace llvm {
2525
class FastISel;

Diff for: include/llvm/CodeGen/SelectionDAGNodes.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
#ifndef LLVM_CODEGEN_SELECTIONDAGNODES_H
2020
#define LLVM_CODEGEN_SELECTIONDAGNODES_H
2121

22-
#include "llvm/ADT/iterator_range.h"
2322
#include "llvm/ADT/BitVector.h"
2423
#include "llvm/ADT/FoldingSet.h"
2524
#include "llvm/ADT/GraphTraits.h"
2625
#include "llvm/ADT/STLExtras.h"
2726
#include "llvm/ADT/SmallPtrSet.h"
2827
#include "llvm/ADT/SmallVector.h"
2928
#include "llvm/ADT/ilist_node.h"
29+
#include "llvm/ADT/iterator_range.h"
3030
#include "llvm/CodeGen/ISDOpcodes.h"
3131
#include "llvm/CodeGen/MachineMemOperand.h"
3232
#include "llvm/CodeGen/ValueTypes.h"

Diff for: include/llvm/DebugInfo/DIContext.h

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "llvm/Object/RelocVisitor.h"
2222
#include "llvm/Support/Casting.h"
2323
#include "llvm/Support/DataTypes.h"
24-
2524
#include <string>
2625

2726
namespace llvm {

Diff for: include/llvm/DebugInfo/DWARFAcceleratorTable.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@
77
//
88
//===----------------------------------------------------------------------===//
99

10-
#include "llvm/DebugInfo/DWARFRelocMap.h"
11-
1210
#include "llvm/ADT/SmallVector.h"
1311
#include "llvm/DebugInfo/DWARFFormValue.h"
14-
12+
#include "llvm/DebugInfo/DWARFRelocMap.h"
1513
#include <cstdint>
1614

1715
namespace llvm {

Diff for: include/llvm/DebugInfo/DWARFContext.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
#include "llvm/ADT/MapVector.h"
1414
#include "llvm/ADT/SmallVector.h"
15+
#include "llvm/DebugInfo/DIContext.h"
1516
#include "llvm/DebugInfo/DWARFCompileUnit.h"
1617
#include "llvm/DebugInfo/DWARFDebugAranges.h"
1718
#include "llvm/DebugInfo/DWARFDebugFrame.h"
@@ -20,7 +21,6 @@
2021
#include "llvm/DebugInfo/DWARFDebugRangeList.h"
2122
#include "llvm/DebugInfo/DWARFSection.h"
2223
#include "llvm/DebugInfo/DWARFTypeUnit.h"
23-
#include "llvm/DebugInfo/DIContext.h"
2424
#include <vector>
2525

2626
namespace llvm {

Diff for: include/llvm/IR/DebugInfo.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
#define LLVM_IR_DEBUGINFO_H
1919

2020
#include "llvm/ADT/DenseMap.h"
21-
#include "llvm/ADT/iterator_range.h"
2221
#include "llvm/ADT/SmallPtrSet.h"
2322
#include "llvm/ADT/SmallVector.h"
2423
#include "llvm/ADT/StringRef.h"
24+
#include "llvm/ADT/iterator_range.h"
2525
#include "llvm/IR/Metadata.h"
2626
#include "llvm/Support/Casting.h"
2727
#include "llvm/Support/Dwarf.h"

Diff for: include/llvm/IR/DebugLoc.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#ifndef LLVM_IR_DEBUGLOC_H
1616
#define LLVM_IR_DEBUGLOC_H
1717

18-
#include "llvm/Support/DataTypes.h"
1918
#include "llvm/IR/TrackingMDRef.h"
19+
#include "llvm/Support/DataTypes.h"
2020

2121
namespace llvm {
2222

Diff for: include/llvm/IR/GlobalValue.h

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
#include "llvm/IR/Constant.h"
2222
#include "llvm/IR/DerivedTypes.h"
23-
2423
#include <system_error>
2524

2625
namespace llvm {

Diff for: include/llvm/IR/Instructions.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
#define LLVM_IR_INSTRUCTIONS_H
1818

1919
#include "llvm/ADT/ArrayRef.h"
20-
#include "llvm/ADT/iterator_range.h"
2120
#include "llvm/ADT/SmallVector.h"
21+
#include "llvm/ADT/iterator_range.h"
2222
#include "llvm/IR/Attributes.h"
2323
#include "llvm/IR/CallingConv.h"
2424
#include "llvm/IR/DerivedTypes.h"

Diff for: include/llvm/IR/Statepoint.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
#define __LLVM_IR_STATEPOINT_H
1818

1919
#include "llvm/ADT/iterator_range.h"
20+
#include "llvm/IR/CallSite.h"
2021
#include "llvm/IR/Instructions.h"
2122
#include "llvm/IR/Intrinsics.h"
22-
#include "llvm/IR/CallSite.h"
2323
#include "llvm/Support/Compiler.h"
2424

2525
namespace llvm {

Diff for: include/llvm/LinkAllPasses.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
#include "llvm/Transforms/Instrumentation.h"
3333
#include "llvm/Transforms/ObjCARC.h"
3434
#include "llvm/Transforms/Scalar.h"
35-
#include "llvm/Transforms/Utils/UnifyFunctionExitNodes.h"
3635
#include "llvm/Transforms/Utils/SymbolRewriter.h"
36+
#include "llvm/Transforms/Utils/UnifyFunctionExitNodes.h"
3737
#include "llvm/Transforms/Vectorize.h"
3838
#include <cstdlib>
3939

Diff for: include/llvm/MC/MCDwarf.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
#define LLVM_MC_MCDWARF_H
1717

1818
#include "llvm/ADT/ArrayRef.h"
19-
#include "llvm/ADT/StringRef.h"
20-
#include "llvm/ADT/StringMap.h"
2119
#include "llvm/ADT/MapVector.h"
20+
#include "llvm/ADT/StringMap.h"
21+
#include "llvm/ADT/StringRef.h"
2222
#include "llvm/Support/Compiler.h"
2323
#include "llvm/Support/Dwarf.h"
2424
#include "llvm/Support/raw_ostream.h"
2525
#include <map>
26-
#include <vector>
2726
#include <string>
2827
#include <utility>
28+
#include <vector>
2929

3030
namespace llvm {
3131
class MCAsmBackend;

Diff for: include/llvm/MC/MCLinkerOptimizationHint.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#define LLVM_MC_MCLINKEROPTIMIZATIONHINT_H
1919

2020
#include "llvm/ADT/SmallVector.h"
21-
#include "llvm/ADT/StringSwitch.h"
2221
#include "llvm/ADT/StringRef.h"
22+
#include "llvm/ADT/StringSwitch.h"
2323
#include "llvm/MC/MCMachObjectWriter.h"
2424
#include "llvm/Support/raw_ostream.h"
2525

Diff for: include/llvm/MC/MCTargetAsmParser.h

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include "llvm/MC/MCExpr.h"
1414
#include "llvm/MC/MCParser/MCAsmParserExtension.h"
1515
#include "llvm/MC/MCTargetOptions.h"
16-
1716
#include <memory>
1817

1918
namespace llvm {

Diff for: include/llvm/MC/MCTargetOptionsCommandFlags.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#ifndef LLVM_MC_MCTARGETOPTIONSCOMMANDFLAGS_H
1616
#define LLVM_MC_MCTARGETOPTIONSCOMMANDFLAGS_H
1717

18-
#include "llvm/Support/CommandLine.h"
1918
#include "llvm/MC/MCTargetOptions.h"
19+
#include "llvm/Support/CommandLine.h"
2020
using namespace llvm;
2121

2222
cl::opt<MCTargetOptions::AsmInstrumentation> AsmInstrumentation(

Diff for: include/llvm/Object/Archive.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#ifndef LLVM_OBJECT_ARCHIVE_H
1515
#define LLVM_OBJECT_ARCHIVE_H
1616

17-
#include "llvm/ADT/iterator_range.h"
1817
#include "llvm/ADT/StringRef.h"
18+
#include "llvm/ADT/iterator_range.h"
1919
#include "llvm/Object/Binary.h"
2020
#include "llvm/Support/ErrorHandling.h"
2121
#include "llvm/Support/ErrorOr.h"

Diff for: include/llvm/Object/MachOUniversal.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
#include "llvm/ADT/StringRef.h"
1818
#include "llvm/ADT/Triple.h"
19-
#include "llvm/Object/Binary.h"
2019
#include "llvm/Object/Archive.h"
20+
#include "llvm/Object/Binary.h"
2121
#include "llvm/Object/MachO.h"
2222
#include "llvm/Support/ErrorOr.h"
2323
#include "llvm/Support/MachO.h"

Diff for: include/llvm/ProfileData/CoverageMappingReader.h

+4-5
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@
1515
#ifndef LLVM_PROFILEDATA_COVERAGEMAPPINGREADER_H
1616
#define LLVM_PROFILEDATA_COVERAGEMAPPINGREADER_H
1717

18-
#include "llvm/ProfileData/InstrProf.h"
19-
#include "llvm/ProfileData/CoverageMapping.h"
20-
#include "llvm/Object/ObjectFile.h"
2118
#include "llvm/ADT/ArrayRef.h"
2219
#include "llvm/ADT/StringRef.h"
23-
#include "llvm/Support/MemoryBuffer.h"
20+
#include "llvm/Object/ObjectFile.h"
21+
#include "llvm/ProfileData/CoverageMapping.h"
22+
#include "llvm/ProfileData/InstrProf.h"
2423
#include "llvm/Support/FileSystem.h"
25-
24+
#include "llvm/Support/MemoryBuffer.h"
2625
#include <iterator>
2726

2827
namespace llvm {

Diff for: include/llvm/ProfileData/CoverageMappingWriter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
#ifndef LLVM_PROFILEDATA_COVERAGEMAPPINGWRITER_H
1616
#define LLVM_PROFILEDATA_COVERAGEMAPPINGWRITER_H
1717

18-
#include "llvm/ProfileData/CoverageMapping.h"
1918
#include "llvm/ADT/ArrayRef.h"
2019
#include "llvm/ADT/StringMap.h"
20+
#include "llvm/ProfileData/CoverageMapping.h"
2121
#include "llvm/Support/raw_ostream.h"
2222

2323
namespace llvm {

Diff for: include/llvm/ProfileData/InstrProfReader.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@
1818
#include "llvm/ADT/ArrayRef.h"
1919
#include "llvm/ADT/StringExtras.h"
2020
#include "llvm/ProfileData/InstrProf.h"
21+
#include "llvm/Support/EndianStream.h"
2122
#include "llvm/Support/ErrorOr.h"
2223
#include "llvm/Support/LineIterator.h"
2324
#include "llvm/Support/MemoryBuffer.h"
24-
#include "llvm/Support/EndianStream.h"
2525
#include "llvm/Support/OnDiskHashTable.h"
26-
2726
#include <iterator>
2827

2928
namespace llvm {

Diff for: include/llvm/ProfileData/InstrProfWriter.h

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "llvm/ProfileData/InstrProf.h"
2222
#include "llvm/Support/DataTypes.h"
2323
#include "llvm/Support/raw_ostream.h"
24-
2524
#include <vector>
2625

2726
namespace llvm {

Diff for: include/llvm/ProfileData/SampleProf.h

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include "llvm/ADT/StringMap.h"
2020
#include "llvm/Support/Debug.h"
2121
#include "llvm/Support/raw_ostream.h"
22-
2322
#include <system_error>
2423

2524
namespace llvm {

0 commit comments

Comments
 (0)