Skip to content

Commit 5ad5f15

Browse files
committed
[cleanup] Move the Dominators.h and Verifier.h headers into the IR
directory. These passes are already defined in the IR library, and it doesn't make any sense to have the headers in Analysis. Long term, I think there is going to be a much better way to divide these matters. The dominators code should be fully separated into the abstract graph algorithm and have that put in Support where it becomes obvious that evn Clang's CFGBlock's can use it. Then the verifier can manually construct dominance information from the Support-driven interface while the Analysis library can provide a pass which both caches, reconstructs, and supports a nice update API. But those are very long term, and so I don't want to leave the really confusing structure until that day arrives. llvm-svn: 199082
1 parent 01e5037 commit 5ad5f15

File tree

91 files changed

+107
-107
lines changed

Some content is hidden

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

91 files changed

+107
-107
lines changed

llvm/include/llvm/Analysis/DominanceFrontier.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#ifndef LLVM_ANALYSIS_DOMINANCEFRONTIER_H
1919
#define LLVM_ANALYSIS_DOMINANCEFRONTIER_H
2020

21-
#include "llvm/Analysis/Dominators.h"
21+
#include "llvm/IR/Dominators.h"
2222
#include <map>
2323
#include <set>
2424

llvm/include/llvm/Analysis/LoopInfoImpl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#include "llvm/ADT/DepthFirstIterator.h"
1919
#include "llvm/ADT/PostOrderIterator.h"
2020
#include "llvm/ADT/STLExtras.h"
21-
#include "llvm/Analysis/Dominators.h"
2221
#include "llvm/Analysis/LoopInfo.h"
22+
#include "llvm/IR/Dominators.h"
2323

2424
namespace llvm {
2525

llvm/include/llvm/Analysis/PostDominators.h

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

17-
#include "llvm/Analysis/Dominators.h"
17+
#include "llvm/IR/Dominators.h"
1818

1919
namespace llvm {
2020

llvm/include/llvm/CodeGen/MachineDominators.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
#ifndef LLVM_CODEGEN_MACHINEDOMINATORS_H
1616
#define LLVM_CODEGEN_MACHINEDOMINATORS_H
1717

18-
#include "llvm/Analysis/DominatorInternals.h"
19-
#include "llvm/Analysis/Dominators.h"
2018
#include "llvm/CodeGen/MachineBasicBlock.h"
2119
#include "llvm/CodeGen/MachineFunction.h"
2220
#include "llvm/CodeGen/MachineFunctionPass.h"
21+
#include "llvm/IR/DominatorInternals.h"
22+
#include "llvm/IR/Dominators.h"
2323

2424
namespace llvm {
2525

llvm/include/llvm/CodeGen/MachinePostDominators.h

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

18-
#include "llvm/Analysis/Dominators.h"
1918
#include "llvm/CodeGen/MachineDominators.h"
2019
#include "llvm/CodeGen/MachineFunctionPass.h"
20+
#include "llvm/IR/Dominators.h"
2121

2222
namespace llvm {
2323

llvm/include/llvm/CodeGen/StackProtector.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "llvm/ADT/SmallPtrSet.h"
2121
#include "llvm/ADT/Triple.h"
2222
#include "llvm/ADT/ValueMap.h"
23-
#include "llvm/Analysis/Dominators.h"
23+
#include "llvm/IR/Dominators.h"
2424
#include "llvm/Pass.h"
2525
#include "llvm/Target/TargetLowering.h"
2626

llvm/include/llvm/Analysis/DominatorInternals.h llvm/include/llvm/IR/DominatorInternals.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//=== llvm/Analysis/DominatorInternals.h - Dominator Calculation -*- C++ -*-==//
1+
//===- DominatorInternals.h - Dominator Calculation --------------*- C++ -*-==//
22
//
33
// The LLVM Compiler Infrastructure
44
//
@@ -7,11 +7,11 @@
77
//
88
//===----------------------------------------------------------------------===//
99

10-
#ifndef LLVM_ANALYSIS_DOMINATOR_INTERNALS_H
11-
#define LLVM_ANALYSIS_DOMINATOR_INTERNALS_H
10+
#ifndef LLVM_IR_DOMINATOR_INTERNALS_H
11+
#define LLVM_IR_DOMINATOR_INTERNALS_H
1212

1313
#include "llvm/ADT/SmallPtrSet.h"
14-
#include "llvm/Analysis/Dominators.h"
14+
#include "llvm/IR/Dominators.h"
1515

1616
//===----------------------------------------------------------------------===//
1717
//

llvm/include/llvm/Analysis/Dominators.h llvm/include/llvm/IR/Dominators.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===- llvm/Analysis/Dominators.h - Dominator Info Calculation --*- C++ -*-===//
1+
//===- Dominators.h - Dominator Info Calculation ----------------*- C++ -*-===//
22
//
33
// The LLVM Compiler Infrastructure
44
//
@@ -12,8 +12,8 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15-
#ifndef LLVM_ANALYSIS_DOMINATORS_H
16-
#define LLVM_ANALYSIS_DOMINATORS_H
15+
#ifndef LLVM_IR_DOMINATORS_H
16+
#define LLVM_IR_DOMINATORS_H
1717

1818
#include "llvm/ADT/DenseMap.h"
1919
#include "llvm/ADT/DepthFirstIterator.h"

llvm/include/llvm/Analysis/Verifier.h llvm/include/llvm/IR/Verifier.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- llvm/Analysis/Verifier.h - LLVM IR Verifier -------------*- C++ -*-===//
1+
//===- Verifier.h - LLVM IR Verifier ----------------------------*- C++ -*-===//
22
//
33
// The LLVM Compiler Infrastructure
44
//
@@ -18,8 +18,8 @@
1818
//
1919
//===----------------------------------------------------------------------===//
2020

21-
#ifndef LLVM_ANALYSIS_VERIFIER_H
22-
#define LLVM_ANALYSIS_VERIFIER_H
21+
#ifndef LLVM_IR_VERIFIER_H
22+
#define LLVM_IR_VERIFIER_H
2323

2424
#include <string>
2525

llvm/include/llvm/LinkAllIR.h

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

19-
#include "llvm/Analysis/Verifier.h"
2019
#include "llvm/IR/InlineAsm.h"
2120
#include "llvm/IR/Instructions.h"
2221
#include "llvm/IR/IntrinsicInst.h"
2322
#include "llvm/IR/LLVMContext.h"
2423
#include "llvm/IR/Module.h"
24+
#include "llvm/IR/Verifier.h"
2525
#include "llvm/Support/Dwarf.h"
2626
#include "llvm/Support/DynamicLibrary.h"
2727
#include "llvm/Support/MathExtras.h"

llvm/lib/Analysis/AliasAnalysis.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
#include "llvm/Analysis/AliasAnalysis.h"
2828
#include "llvm/Analysis/CFG.h"
2929
#include "llvm/Analysis/CaptureTracking.h"
30-
#include "llvm/Analysis/Dominators.h"
3130
#include "llvm/Analysis/ValueTracking.h"
3231
#include "llvm/IR/BasicBlock.h"
3332
#include "llvm/IR/DataLayout.h"
33+
#include "llvm/IR/Dominators.h"
3434
#include "llvm/IR/Function.h"
3535
#include "llvm/IR/Instructions.h"
3636
#include "llvm/IR/IntrinsicInst.h"

llvm/lib/Analysis/Analysis.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
#include "llvm-c/Analysis.h"
1111
#include "llvm-c/Initialization.h"
12-
#include "llvm/Analysis/Verifier.h"
1312
#include "llvm/IR/Module.h"
13+
#include "llvm/IR/Verifier.h"
1414
#include "llvm/InitializePasses.h"
1515
#include "llvm/PassRegistry.h"
1616
#include <cstring>

llvm/lib/Analysis/BasicAliasAnalysis.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
#include "llvm/Analysis/AliasAnalysis.h"
2020
#include "llvm/Analysis/CFG.h"
2121
#include "llvm/Analysis/CaptureTracking.h"
22-
#include "llvm/Analysis/Dominators.h"
2322
#include "llvm/Analysis/InstructionSimplify.h"
2423
#include "llvm/Analysis/LoopInfo.h"
2524
#include "llvm/Analysis/MemoryBuiltins.h"
2625
#include "llvm/Analysis/ValueTracking.h"
2726
#include "llvm/IR/Constants.h"
2827
#include "llvm/IR/DataLayout.h"
2928
#include "llvm/IR/DerivedTypes.h"
29+
#include "llvm/IR/Dominators.h"
3030
#include "llvm/IR/Function.h"
3131
#include "llvm/IR/GlobalAlias.h"
3232
#include "llvm/IR/GlobalVariable.h"

llvm/lib/Analysis/CFG.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
#include "llvm/Analysis/CFG.h"
1616
#include "llvm/ADT/SmallSet.h"
17-
#include "llvm/Analysis/Dominators.h"
1817
#include "llvm/Analysis/LoopInfo.h"
18+
#include "llvm/IR/Dominators.h"
1919

2020
using namespace llvm;
2121

llvm/lib/Analysis/IVUsers.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
#define DEBUG_TYPE "iv-users"
1616
#include "llvm/Analysis/IVUsers.h"
1717
#include "llvm/ADT/STLExtras.h"
18-
#include "llvm/Analysis/Dominators.h"
1918
#include "llvm/Analysis/LoopPass.h"
2019
#include "llvm/Analysis/ScalarEvolutionExpressions.h"
2120
#include "llvm/Analysis/ValueTracking.h"
2221
#include "llvm/IR/Constants.h"
2322
#include "llvm/IR/DataLayout.h"
2423
#include "llvm/IR/DerivedTypes.h"
24+
#include "llvm/IR/Dominators.h"
2525
#include "llvm/IR/Instructions.h"
2626
#include "llvm/IR/Type.h"
2727
#include "llvm/Support/Debug.h"

llvm/lib/Analysis/InstructionSimplify.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
#include "llvm/ADT/SetVector.h"
2323
#include "llvm/ADT/Statistic.h"
2424
#include "llvm/Analysis/ConstantFolding.h"
25-
#include "llvm/Analysis/Dominators.h"
2625
#include "llvm/Analysis/MemoryBuiltins.h"
2726
#include "llvm/Analysis/ValueTracking.h"
2827
#include "llvm/IR/DataLayout.h"
28+
#include "llvm/IR/Dominators.h"
2929
#include "llvm/IR/GlobalAlias.h"
3030
#include "llvm/IR/Operator.h"
3131
#include "llvm/Support/ConstantRange.h"

llvm/lib/Analysis/Lint.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@
3838
#include "llvm/ADT/STLExtras.h"
3939
#include "llvm/Analysis/AliasAnalysis.h"
4040
#include "llvm/Analysis/ConstantFolding.h"
41-
#include "llvm/Analysis/Dominators.h"
4241
#include "llvm/Analysis/InstructionSimplify.h"
4342
#include "llvm/Analysis/Loads.h"
4443
#include "llvm/Analysis/Passes.h"
4544
#include "llvm/Analysis/ValueTracking.h"
4645
#include "llvm/IR/DataLayout.h"
46+
#include "llvm/IR/Dominators.h"
4747
#include "llvm/IR/Function.h"
4848
#include "llvm/IR/IntrinsicInst.h"
4949
#include "llvm/InstVisitor.h"

llvm/lib/Analysis/LoopInfo.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
#include "llvm/Analysis/LoopInfo.h"
1818
#include "llvm/ADT/DepthFirstIterator.h"
1919
#include "llvm/ADT/SmallPtrSet.h"
20-
#include "llvm/Analysis/Dominators.h"
2120
#include "llvm/Analysis/LoopInfoImpl.h"
2221
#include "llvm/Analysis/LoopIterator.h"
2322
#include "llvm/Analysis/ValueTracking.h"
2423
#include "llvm/IR/Constants.h"
24+
#include "llvm/IR/Dominators.h"
2525
#include "llvm/IR/Instructions.h"
2626
#include "llvm/IR/Metadata.h"
2727
#include "llvm/Support/CFG.h"

llvm/lib/Analysis/MemoryDependenceAnalysis.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
#include "llvm/ADT/STLExtras.h"
2020
#include "llvm/ADT/Statistic.h"
2121
#include "llvm/Analysis/AliasAnalysis.h"
22-
#include "llvm/Analysis/Dominators.h"
2322
#include "llvm/Analysis/InstructionSimplify.h"
2423
#include "llvm/Analysis/MemoryBuiltins.h"
2524
#include "llvm/Analysis/PHITransAddr.h"
2625
#include "llvm/Analysis/ValueTracking.h"
2726
#include "llvm/IR/DataLayout.h"
27+
#include "llvm/IR/Dominators.h"
2828
#include "llvm/IR/Function.h"
2929
#include "llvm/IR/Instructions.h"
3030
#include "llvm/IR/IntrinsicInst.h"

llvm/lib/Analysis/PHITransAddr.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
//===----------------------------------------------------------------------===//
1313

1414
#include "llvm/Analysis/PHITransAddr.h"
15-
#include "llvm/Analysis/Dominators.h"
1615
#include "llvm/Analysis/InstructionSimplify.h"
1716
#include "llvm/Analysis/ValueTracking.h"
1817
#include "llvm/IR/Constants.h"
18+
#include "llvm/IR/Dominators.h"
1919
#include "llvm/IR/Instructions.h"
2020
#include "llvm/Support/Debug.h"
2121
#include "llvm/Support/ErrorHandling.h"

llvm/lib/Analysis/PostDominators.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "llvm/Analysis/PostDominators.h"
1717
#include "llvm/ADT/DepthFirstIterator.h"
1818
#include "llvm/ADT/SetOperations.h"
19-
#include "llvm/Analysis/DominatorInternals.h"
19+
#include "llvm/IR/DominatorInternals.h"
2020
#include "llvm/IR/Instructions.h"
2121
#include "llvm/Support/CFG.h"
2222
#include "llvm/Support/Debug.h"

llvm/lib/Analysis/ScalarEvolution.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@
6464
#include "llvm/ADT/SmallPtrSet.h"
6565
#include "llvm/ADT/Statistic.h"
6666
#include "llvm/Analysis/ConstantFolding.h"
67-
#include "llvm/Analysis/Dominators.h"
6867
#include "llvm/Analysis/InstructionSimplify.h"
6968
#include "llvm/Analysis/LoopInfo.h"
7069
#include "llvm/Analysis/ScalarEvolutionExpressions.h"
7170
#include "llvm/Analysis/ValueTracking.h"
7271
#include "llvm/IR/Constants.h"
7372
#include "llvm/IR/DataLayout.h"
7473
#include "llvm/IR/DerivedTypes.h"
74+
#include "llvm/IR/Dominators.h"
7575
#include "llvm/IR/GlobalAlias.h"
7676
#include "llvm/IR/GlobalVariable.h"
7777
#include "llvm/IR/Instructions.h"

llvm/lib/Analysis/ScalarEvolutionExpander.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
#include "llvm/Analysis/ScalarEvolutionExpander.h"
1717
#include "llvm/ADT/STLExtras.h"
1818
#include "llvm/ADT/SmallSet.h"
19-
#include "llvm/Analysis/Dominators.h"
2019
#include "llvm/Analysis/LoopInfo.h"
2120
#include "llvm/Analysis/TargetTransformInfo.h"
2221
#include "llvm/IR/DataLayout.h"
22+
#include "llvm/IR/Dominators.h"
2323
#include "llvm/IR/IntrinsicInst.h"
2424
#include "llvm/IR/LLVMContext.h"
2525
#include "llvm/Support/Debug.h"

llvm/lib/Analysis/ScalarEvolutionNormalization.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15-
#include "llvm/Analysis/Dominators.h"
15+
#include "llvm/IR/Dominators.h"
1616
#include "llvm/Analysis/LoopInfo.h"
1717
#include "llvm/Analysis/ScalarEvolutionExpressions.h"
1818
#include "llvm/Analysis/ScalarEvolutionNormalization.h"

llvm/lib/CodeGen/DwarfEHPrepare.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#define DEBUG_TYPE "dwarfehprepare"
1616
#include "llvm/CodeGen/Passes.h"
1717
#include "llvm/ADT/Statistic.h"
18-
#include "llvm/Analysis/Dominators.h"
18+
#include "llvm/IR/Dominators.h"
1919
#include "llvm/IR/Function.h"
2020
#include "llvm/IR/Instructions.h"
2121
#include "llvm/IR/IntrinsicInst.h"

llvm/lib/CodeGen/GCStrategy.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
//===----------------------------------------------------------------------===//
1717

1818
#include "llvm/CodeGen/GCStrategy.h"
19-
#include "llvm/Analysis/DominatorInternals.h"
20-
#include "llvm/Analysis/Dominators.h"
2119
#include "llvm/CodeGen/MachineFrameInfo.h"
2220
#include "llvm/CodeGen/MachineFunctionPass.h"
2321
#include "llvm/CodeGen/MachineInstrBuilder.h"
2422
#include "llvm/CodeGen/MachineModuleInfo.h"
2523
#include "llvm/CodeGen/Passes.h"
24+
#include "llvm/IR/DominatorInternals.h"
25+
#include "llvm/IR/Dominators.h"
2626
#include "llvm/IR/IntrinsicInst.h"
2727
#include "llvm/IR/Module.h"
2828
#include "llvm/Support/Debug.h"

llvm/lib/CodeGen/Passes.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414

1515
#include "llvm/CodeGen/Passes.h"
1616
#include "llvm/Analysis/Passes.h"
17-
#include "llvm/Analysis/Verifier.h"
1817
#include "llvm/CodeGen/GCStrategy.h"
1918
#include "llvm/CodeGen/MachineFunctionPass.h"
2019
#include "llvm/CodeGen/RegAllocRegistry.h"
2120
#include "llvm/IR/IRPrintingPasses.h"
21+
#include "llvm/IR/Verifier.h"
2222
#include "llvm/MC/MCAsmInfo.h"
2323
#include "llvm/PassManager.h"
2424
#include "llvm/Support/CommandLine.h"

llvm/lib/CodeGen/StackColoring.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include "llvm/ADT/SmallPtrSet.h"
3131
#include "llvm/ADT/SparseSet.h"
3232
#include "llvm/ADT/Statistic.h"
33-
#include "llvm/Analysis/Dominators.h"
3433
#include "llvm/Analysis/ValueTracking.h"
3534
#include "llvm/CodeGen/LiveInterval.h"
3635
#include "llvm/CodeGen/MachineBasicBlock.h"
@@ -45,6 +44,7 @@
4544
#include "llvm/CodeGen/PseudoSourceValue.h"
4645
#include "llvm/CodeGen/SlotIndexes.h"
4746
#include "llvm/DebugInfo.h"
47+
#include "llvm/IR/Dominators.h"
4848
#include "llvm/IR/Function.h"
4949
#include "llvm/IR/Instructions.h"
5050
#include "llvm/IR/Module.h"

llvm/lib/CodeGen/UnreachableBlockElim.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
#include "llvm/CodeGen/Passes.h"
2424
#include "llvm/ADT/DepthFirstIterator.h"
2525
#include "llvm/ADT/SmallPtrSet.h"
26-
#include "llvm/Analysis/Dominators.h"
2726
#include "llvm/CodeGen/MachineDominators.h"
2827
#include "llvm/CodeGen/MachineFunctionPass.h"
2928
#include "llvm/CodeGen/MachineLoopInfo.h"
3029
#include "llvm/CodeGen/MachineModuleInfo.h"
3130
#include "llvm/CodeGen/MachineRegisterInfo.h"
3231
#include "llvm/IR/Constant.h"
32+
#include "llvm/IR/Dominators.h"
3333
#include "llvm/IR/Function.h"
3434
#include "llvm/IR/Instructions.h"
3535
#include "llvm/IR/Type.h"

llvm/lib/IR/Dominators.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
//
1515
//===----------------------------------------------------------------------===//
1616

17-
#include "llvm/Analysis/Dominators.h"
17+
#include "llvm/IR/Dominators.h"
1818
#include "llvm/ADT/DepthFirstIterator.h"
1919
#include "llvm/ADT/SmallPtrSet.h"
2020
#include "llvm/ADT/SmallVector.h"
21-
#include "llvm/Analysis/DominatorInternals.h"
21+
#include "llvm/IR/DominatorInternals.h"
2222
#include "llvm/IR/Instructions.h"
2323
#include "llvm/Support/CFG.h"
2424
#include "llvm/Support/CommandLine.h"

0 commit comments

Comments
 (0)