From 47b14a4a6a455c7be169cfd312fcbe796f0ad426 Mon Sep 17 00:00:00 2001 From: Misha Brukman Date: Thu, 29 Jul 2004 17:30:56 +0000 Subject: [PATCH] Fix #includes of i*.h => Instructions.h as per PR403. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@15334 91177308-0d34-0410-b5e6-96231b3b80d8 --- docs/ExtendingLLVM.html | 2 +- lib/Analysis/AliasAnalysis.cpp | 2 +- lib/Analysis/AliasAnalysisEvaluator.cpp | 3 +-- lib/Analysis/AliasSetTracker.cpp | 4 +--- lib/Analysis/CFGPrinter.cpp | 2 +- lib/Analysis/DataStructure/DataStructure.cpp | 2 +- lib/Analysis/IPA/CallGraph.cpp | 3 +-- lib/Analysis/LoadValueNumbering.cpp | 3 +-- lib/Analysis/PostDominators.cpp | 2 +- lib/CodeGen/IntrinsicLowering.cpp | 2 +- lib/CodeGen/MachineFunction.cpp | 2 +- lib/CodeGen/MachineInstrAnnot.cpp | 2 +- lib/Linker/LinkModules.cpp | 2 +- lib/Transforms/IPO/DeadArgumentElimination.cpp | 3 +-- lib/Transforms/IPO/FunctionResolution.cpp | 2 +- lib/Transforms/IPO/Inliner.cpp | 3 +-- lib/Transforms/IPO/LoopExtractor.cpp | 2 +- lib/Transforms/IPO/PruneEH.cpp | 3 +-- lib/Transforms/IPO/RaiseAllocations.cpp | 4 +--- .../Instrumentation/ProfilePaths/CombineBranch.cpp | 3 +-- lib/Transforms/Instrumentation/ProfilePaths/EdgeCode.cpp | 6 +----- lib/Transforms/Instrumentation/ProfilePaths/Graph.cpp | 2 +- .../Instrumentation/ProfilePaths/GraphAuxiliary.cpp | 2 +- lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp | 6 ++---- .../Instrumentation/ProfilePaths/ProfilePaths.cpp | 4 +--- lib/Transforms/Instrumentation/ProfilePaths/RetracePath.cpp | 3 +-- lib/Transforms/Instrumentation/TraceBasicBlocks.cpp | 4 +--- lib/Transforms/Instrumentation/TraceValues.cpp | 4 +--- lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp | 3 +-- lib/Transforms/Utils/BasicBlockUtils.cpp | 2 +- lib/Transforms/Utils/BreakCriticalEdges.cpp | 2 +- lib/Transforms/Utils/CloneFunction.cpp | 2 +- lib/Transforms/Utils/CloneTrace.cpp | 2 +- lib/Transforms/Utils/LoopSimplify.cpp | 3 +-- lib/Transforms/Utils/LowerAllocations.cpp | 3 +-- lib/Transforms/Utils/Mem2Reg.cpp | 2 +- lib/Transforms/Utils/PromoteMemoryToRegister.cpp | 4 +--- lib/VMCore/Constants.cpp | 2 +- lib/VMCore/InstrTypes.cpp | 3 +-- lib/VMCore/Linker.cpp | 2 +- projects/Stacker/lib/compiler/StackerCompiler.cpp | 5 +---- projects/Stacker/lib/compiler/StackerParser.y | 5 +---- tools/bugpoint/CrashDebugger.cpp | 2 +- tools/bugpoint/TestPasses.cpp | 2 +- 44 files changed, 45 insertions(+), 81 deletions(-) diff --git a/docs/ExtendingLLVM.html b/docs/ExtendingLLVM.html index d86b1a47dc8..8ff27362e9a 100644 --- a/docs/ExtendingLLVM.html +++ b/docs/ExtendingLLVM.html @@ -135,7 +135,7 @@ necessary.

  • llvm/include/llvm/Instruction.def: add a number for your instruction and an enum name
    • -
  • llvm/include/llvm/i*.h: +
  • llvm/include/llvm/Instructions.h: add a definition for the class that will represent your instruction
  • llvm/include/llvm/Support/InstVisitor.h: diff --git a/lib/Analysis/AliasAnalysis.cpp b/lib/Analysis/AliasAnalysis.cpp index f1b0f56b847..0e3f159ac04 100644 --- a/lib/Analysis/AliasAnalysis.cpp +++ b/lib/Analysis/AliasAnalysis.cpp @@ -26,7 +26,7 @@ #include "llvm/Analysis/AliasAnalysis.h" #include "llvm/BasicBlock.h" -#include "llvm/iMemory.h" +#include "llvm/Instructions.h" #include "llvm/Target/TargetData.h" #include using namespace llvm; diff --git a/lib/Analysis/AliasAnalysisEvaluator.cpp b/lib/Analysis/AliasAnalysisEvaluator.cpp index 2794fef33d1..b4a183d1c40 100644 --- a/lib/Analysis/AliasAnalysisEvaluator.cpp +++ b/lib/Analysis/AliasAnalysisEvaluator.cpp @@ -18,8 +18,7 @@ //===----------------------------------------------------------------------===// #include "llvm/Function.h" -#include "llvm/iOther.h" -#include "llvm/iTerminators.h" +#include "llvm/Instructions.h" #include "llvm/Pass.h" #include "llvm/DerivedTypes.h" #include "llvm/Analysis/AliasAnalysis.h" diff --git a/lib/Analysis/AliasSetTracker.cpp b/lib/Analysis/AliasSetTracker.cpp index 2db9134b864..e5f7f32f9c7 100644 --- a/lib/Analysis/AliasSetTracker.cpp +++ b/lib/Analysis/AliasSetTracker.cpp @@ -13,9 +13,7 @@ #include "llvm/Analysis/AliasSetTracker.h" #include "llvm/Analysis/AliasAnalysis.h" -#include "llvm/iMemory.h" -#include "llvm/iOther.h" -#include "llvm/iTerminators.h" +#include "llvm/Instructions.h" #include "llvm/Pass.h" #include "llvm/Target/TargetData.h" #include "llvm/Assembly/Writer.h" diff --git a/lib/Analysis/CFGPrinter.cpp b/lib/Analysis/CFGPrinter.cpp index ddd9851b740..9eaaec690b8 100644 --- a/lib/Analysis/CFGPrinter.cpp +++ b/lib/Analysis/CFGPrinter.cpp @@ -18,7 +18,7 @@ //===----------------------------------------------------------------------===// #include "llvm/Function.h" -#include "llvm/iTerminators.h" +#include "llvm/Instructions.h" #include "llvm/Pass.h" #include "llvm/Analysis/CFGPrinter.h" #include "llvm/Assembly/Writer.h" diff --git a/lib/Analysis/DataStructure/DataStructure.cpp b/lib/Analysis/DataStructure/DataStructure.cpp index 4acf46eb554..83aa890d96f 100644 --- a/lib/Analysis/DataStructure/DataStructure.cpp +++ b/lib/Analysis/DataStructure/DataStructure.cpp @@ -14,7 +14,7 @@ #include "llvm/Analysis/DataStructure/DSGraphTraits.h" #include "llvm/Function.h" #include "llvm/GlobalVariable.h" -#include "llvm/iOther.h" +#include "llvm/Instructions.h" #include "llvm/DerivedTypes.h" #include "llvm/Target/TargetData.h" #include "llvm/Assembly/Writer.h" diff --git a/lib/Analysis/IPA/CallGraph.cpp b/lib/Analysis/IPA/CallGraph.cpp index 72b4bdbc520..197c7c53d60 100644 --- a/lib/Analysis/IPA/CallGraph.cpp +++ b/lib/Analysis/IPA/CallGraph.cpp @@ -14,8 +14,7 @@ #include "llvm/Analysis/CallGraph.h" #include "llvm/Constants.h" // Remove when ConstantPointerRefs are gone #include "llvm/Module.h" -#include "llvm/iOther.h" -#include "llvm/iTerminators.h" +#include "llvm/Instructions.h" #include "llvm/Support/CallSite.h" #include "Support/STLExtras.h" using namespace llvm; diff --git a/lib/Analysis/LoadValueNumbering.cpp b/lib/Analysis/LoadValueNumbering.cpp index 4bc7483babb..f4a7a978d66 100644 --- a/lib/Analysis/LoadValueNumbering.cpp +++ b/lib/Analysis/LoadValueNumbering.cpp @@ -24,8 +24,7 @@ #include "llvm/Analysis/LoadValueNumbering.h" #include "llvm/Constant.h" #include "llvm/Function.h" -#include "llvm/iMemory.h" -#include "llvm/iOther.h" +#include "llvm/Instructions.h" #include "llvm/Pass.h" #include "llvm/Type.h" #include "llvm/Analysis/ValueNumbering.h" diff --git a/lib/Analysis/PostDominators.cpp b/lib/Analysis/PostDominators.cpp index 5f5a867a8bc..ff202f0151d 100644 --- a/lib/Analysis/PostDominators.cpp +++ b/lib/Analysis/PostDominators.cpp @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// #include "llvm/Analysis/PostDominators.h" -#include "llvm/iTerminators.h" +#include "llvm/Instructions.h" #include "llvm/Support/CFG.h" #include "Support/DepthFirstIterator.h" #include "Support/SetOperations.h" diff --git a/lib/CodeGen/IntrinsicLowering.cpp b/lib/CodeGen/IntrinsicLowering.cpp index c200aebf06d..63ff8152913 100644 --- a/lib/CodeGen/IntrinsicLowering.cpp +++ b/lib/CodeGen/IntrinsicLowering.cpp @@ -15,7 +15,7 @@ #include "llvm/Constants.h" #include "llvm/DerivedTypes.h" #include "llvm/Module.h" -#include "llvm/iOther.h" +#include "llvm/Instructions.h" #include using namespace llvm; diff --git a/lib/CodeGen/MachineFunction.cpp b/lib/CodeGen/MachineFunction.cpp index 63785a301b9..1ad3fdb0fa2 100644 --- a/lib/CodeGen/MachineFunction.cpp +++ b/lib/CodeGen/MachineFunction.cpp @@ -23,7 +23,7 @@ #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetFrameInfo.h" #include "llvm/Function.h" -#include "llvm/iOther.h" +#include "llvm/Instructions.h" #include "llvm/Type.h" #include "Support/LeakDetector.h" #include "Support/GraphWriter.h" diff --git a/lib/CodeGen/MachineInstrAnnot.cpp b/lib/CodeGen/MachineInstrAnnot.cpp index a784978299b..99f6c76a28b 100644 --- a/lib/CodeGen/MachineInstrAnnot.cpp +++ b/lib/CodeGen/MachineInstrAnnot.cpp @@ -15,7 +15,7 @@ #include "../Target/SparcV9/MachineInstrAnnot.h" #include "llvm/CodeGen/InstrSelection.h" #include "llvm/CodeGen/MachineCodeForInstruction.h" -#include "llvm/iOther.h" +#include "llvm/Instructions.h" #include "llvm/Type.h" using namespace llvm; diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp index 4cd852cbb2f..64eb4888ddd 100644 --- a/lib/Linker/LinkModules.cpp +++ b/lib/Linker/LinkModules.cpp @@ -21,7 +21,7 @@ #include "llvm/DerivedTypes.h" #include "llvm/Module.h" #include "llvm/SymbolTable.h" -#include "llvm/iOther.h" +#include "llvm/Instructions.h" #include "llvm/Assembly/Writer.h" #include diff --git a/lib/Transforms/IPO/DeadArgumentElimination.cpp b/lib/Transforms/IPO/DeadArgumentElimination.cpp index 19b61907beb..836e0b60912 100644 --- a/lib/Transforms/IPO/DeadArgumentElimination.cpp +++ b/lib/Transforms/IPO/DeadArgumentElimination.cpp @@ -22,8 +22,7 @@ #include "llvm/Pass.h" #include "llvm/DerivedTypes.h" #include "llvm/Constant.h" -#include "llvm/iOther.h" -#include "llvm/iTerminators.h" +#include "llvm/Instructions.h" #include "llvm/Support/CallSite.h" #include "Support/Debug.h" #include "Support/Statistic.h" diff --git a/lib/Transforms/IPO/FunctionResolution.cpp b/lib/Transforms/IPO/FunctionResolution.cpp index 695287f7c44..9cf26b61926 100644 --- a/lib/Transforms/IPO/FunctionResolution.cpp +++ b/lib/Transforms/IPO/FunctionResolution.cpp @@ -22,7 +22,7 @@ #include "llvm/Module.h" #include "llvm/DerivedTypes.h" #include "llvm/Pass.h" -#include "llvm/iOther.h" +#include "llvm/Instructions.h" #include "llvm/Constants.h" #include "llvm/Support/CallSite.h" #include "llvm/Target/TargetData.h" diff --git a/lib/Transforms/IPO/Inliner.cpp b/lib/Transforms/IPO/Inliner.cpp index 0a1bdea6606..a9621410520 100644 --- a/lib/Transforms/IPO/Inliner.cpp +++ b/lib/Transforms/IPO/Inliner.cpp @@ -15,8 +15,7 @@ #include "Inliner.h" #include "llvm/Module.h" -#include "llvm/iOther.h" -#include "llvm/iTerminators.h" +#include "llvm/Instructions.h" #include "llvm/Analysis/CallGraph.h" #include "llvm/Support/CallSite.h" #include "llvm/Transforms/Utils/Cloning.h" diff --git a/lib/Transforms/IPO/LoopExtractor.cpp b/lib/Transforms/IPO/LoopExtractor.cpp index 65f9514874f..84359beb9b2 100644 --- a/lib/Transforms/IPO/LoopExtractor.cpp +++ b/lib/Transforms/IPO/LoopExtractor.cpp @@ -15,7 +15,7 @@ //===----------------------------------------------------------------------===// #include "llvm/Transforms/IPO.h" -#include "llvm/iTerminators.h" +#include "llvm/Instructions.h" #include "llvm/Module.h" #include "llvm/Pass.h" #include "llvm/Analysis/Dominators.h" diff --git a/lib/Transforms/IPO/PruneEH.cpp b/lib/Transforms/IPO/PruneEH.cpp index 418c3528d30..fbb16594882 100644 --- a/lib/Transforms/IPO/PruneEH.cpp +++ b/lib/Transforms/IPO/PruneEH.cpp @@ -18,8 +18,7 @@ #include "llvm/CallGraphSCCPass.h" #include "llvm/Function.h" #include "llvm/Intrinsics.h" -#include "llvm/iTerminators.h" -#include "llvm/iOther.h" +#include "llvm/Instructions.h" #include "llvm/Analysis/CallGraph.h" #include "Support/Statistic.h" #include diff --git a/lib/Transforms/IPO/RaiseAllocations.cpp b/lib/Transforms/IPO/RaiseAllocations.cpp index ca8b7cc5537..36aef9c8eb6 100644 --- a/lib/Transforms/IPO/RaiseAllocations.cpp +++ b/lib/Transforms/IPO/RaiseAllocations.cpp @@ -16,9 +16,7 @@ #include "llvm/Constants.h" #include "llvm/DerivedTypes.h" #include "llvm/Module.h" -#include "llvm/iMemory.h" -#include "llvm/iTerminators.h" -#include "llvm/iOther.h" +#include "llvm/Instructions.h" #include "llvm/Pass.h" #include "llvm/Support/CallSite.h" #include "Support/Statistic.h" diff --git a/lib/Transforms/Instrumentation/ProfilePaths/CombineBranch.cpp b/lib/Transforms/Instrumentation/ProfilePaths/CombineBranch.cpp index e395b26c821..fe2839b3251 100644 --- a/lib/Transforms/Instrumentation/ProfilePaths/CombineBranch.cpp +++ b/lib/Transforms/Instrumentation/ProfilePaths/CombineBranch.cpp @@ -14,8 +14,7 @@ //===----------------------------------------------------------------------===// #include "llvm/Support/CFG.h" -#include "llvm/iTerminators.h" -#include "llvm/iPHINode.h" +#include "llvm/Instructions.h" #include "llvm/Function.h" #include "llvm/Pass.h" diff --git a/lib/Transforms/Instrumentation/ProfilePaths/EdgeCode.cpp b/lib/Transforms/Instrumentation/ProfilePaths/EdgeCode.cpp index 51bc42535c5..8e7bd789580 100644 --- a/lib/Transforms/Instrumentation/ProfilePaths/EdgeCode.cpp +++ b/lib/Transforms/Instrumentation/ProfilePaths/EdgeCode.cpp @@ -17,11 +17,7 @@ #include "Graph.h" #include "llvm/Constants.h" #include "llvm/DerivedTypes.h" -#include "llvm/iMemory.h" -#include "llvm/iTerminators.h" -#include "llvm/iOther.h" -#include "llvm/iOperators.h" -#include "llvm/iPHINode.h" +#include "llvm/Instructions.h" #include "llvm/Module.h" #define INSERT_LOAD_COUNT diff --git a/lib/Transforms/Instrumentation/ProfilePaths/Graph.cpp b/lib/Transforms/Instrumentation/ProfilePaths/Graph.cpp index d69c4c3b4ce..c60636cfb57 100644 --- a/lib/Transforms/Instrumentation/ProfilePaths/Graph.cpp +++ b/lib/Transforms/Instrumentation/ProfilePaths/Graph.cpp @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// #include "Graph.h" -#include "llvm/iTerminators.h" +#include "llvm/Instructions.h" #include "Support/Debug.h" #include diff --git a/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp b/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp index d9dc011cd5e..4e8419d9656 100644 --- a/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp +++ b/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp @@ -14,7 +14,7 @@ #include "llvm/Pass.h" #include "llvm/Module.h" -#include "llvm/iTerminators.h" +#include "llvm/Instructions.h" #include "Support/Debug.h" #include #include "Graph.h" diff --git a/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp b/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp index 5d53d230c94..96d23f2253e 100644 --- a/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp +++ b/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp @@ -16,12 +16,10 @@ #include "llvm/Analysis/Dominators.h" #include "llvm/Support/CFG.h" -#include "llvm/iOther.h" -#include "llvm/Type.h" -#include "llvm/iTerminators.h" -#include "llvm/iPHINode.h" +#include "llvm/Instructions.h" #include "llvm/Module.h" #include "llvm/Pass.h" +#include "llvm/Type.h" #include "Support/Debug.h" #include "../ProfilingUtils.h" diff --git a/lib/Transforms/Instrumentation/ProfilePaths/ProfilePaths.cpp b/lib/Transforms/Instrumentation/ProfilePaths/ProfilePaths.cpp index 5728265f427..ef7b9b38186 100644 --- a/lib/Transforms/Instrumentation/ProfilePaths/ProfilePaths.cpp +++ b/lib/Transforms/Instrumentation/ProfilePaths/ProfilePaths.cpp @@ -35,9 +35,7 @@ #include "llvm/Support/CFG.h" #include "llvm/Constants.h" #include "llvm/DerivedTypes.h" -#include "llvm/iMemory.h" -#include "llvm/iOperators.h" -#include "llvm/iOther.h" +#include "llvm/Instructions.h" #include "llvm/Module.h" #include "Graph.h" #include diff --git a/lib/Transforms/Instrumentation/ProfilePaths/RetracePath.cpp b/lib/Transforms/Instrumentation/ProfilePaths/RetracePath.cpp index 21d11bec2e0..fd0844e14b9 100644 --- a/lib/Transforms/Instrumentation/ProfilePaths/RetracePath.cpp +++ b/lib/Transforms/Instrumentation/ProfilePaths/RetracePath.cpp @@ -12,8 +12,7 @@ //===----------------------------------------------------------------------===// #include "llvm/Module.h" -#include "llvm/iTerminators.h" -#include "llvm/iOther.h" +#include "llvm/Instructions.h" #include "llvm/Support/CFG.h" #include "Graph.h" #include diff --git a/lib/Transforms/Instrumentation/TraceBasicBlocks.cpp b/lib/Transforms/Instrumentation/TraceBasicBlocks.cpp index 9403aa26f75..3953c28e52b 100644 --- a/lib/Transforms/Instrumentation/TraceBasicBlocks.cpp +++ b/lib/Transforms/Instrumentation/TraceBasicBlocks.cpp @@ -18,9 +18,7 @@ #include "llvm/Module.h" #include "llvm/Pass.h" #include "llvm/Transforms/Utils/BasicBlockUtils.h" -#include "llvm/iOther.h" -#include "llvm/iMemory.h" -#include "llvm/iPHINode.h" +#include "llvm/Instructions.h" #include "ProfilingUtils.h" #include "Support/Debug.h" #include diff --git a/lib/Transforms/Instrumentation/TraceValues.cpp b/lib/Transforms/Instrumentation/TraceValues.cpp index 6cc46fa6c67..ae356a2f73d 100644 --- a/lib/Transforms/Instrumentation/TraceValues.cpp +++ b/lib/Transforms/Instrumentation/TraceValues.cpp @@ -15,9 +15,7 @@ #include "llvm/Transforms/Instrumentation.h" #include "llvm/Constants.h" #include "llvm/DerivedTypes.h" -#include "llvm/iMemory.h" -#include "llvm/iTerminators.h" -#include "llvm/iOther.h" +#include "llvm/Instructions.h" #include "llvm/Module.h" #include "llvm/Pass.h" #include "llvm/Assembly/Writer.h" diff --git a/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp b/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp index 72e537a7dcd..b1f8f2a01ab 100644 --- a/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp +++ b/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp @@ -19,8 +19,7 @@ #include "llvm/DerivedTypes.h" #include "llvm/Constants.h" #include "llvm/Constant.h" -#include "llvm/iMemory.h" -#include "llvm/iOther.h" +#include "llvm/Instructions.h" #include "llvm/BasicBlock.h" #include "llvm/Pass.h" #include "Support/Statistic.h" diff --git a/lib/Transforms/Utils/BasicBlockUtils.cpp b/lib/Transforms/Utils/BasicBlockUtils.cpp index 945e15fd0b9..ab315b6b756 100644 --- a/lib/Transforms/Utils/BasicBlockUtils.cpp +++ b/lib/Transforms/Utils/BasicBlockUtils.cpp @@ -14,7 +14,7 @@ #include "llvm/Transforms/Utils/BasicBlockUtils.h" #include "llvm/Function.h" -#include "llvm/iTerminators.h" +#include "llvm/Instructions.h" #include "llvm/Constant.h" #include "llvm/Type.h" #include diff --git a/lib/Transforms/Utils/BreakCriticalEdges.cpp b/lib/Transforms/Utils/BreakCriticalEdges.cpp index 8e00f9c613e..9042ac41217 100644 --- a/lib/Transforms/Utils/BreakCriticalEdges.cpp +++ b/lib/Transforms/Utils/BreakCriticalEdges.cpp @@ -20,7 +20,7 @@ #include "llvm/Transforms/Utils/BasicBlockUtils.h" #include "llvm/Analysis/Dominators.h" #include "llvm/Function.h" -#include "llvm/iTerminators.h" +#include "llvm/Instructions.h" #include "llvm/iPHINode.h" #include "llvm/Support/CFG.h" #include "Support/Statistic.h" diff --git a/lib/Transforms/Utils/CloneFunction.cpp b/lib/Transforms/Utils/CloneFunction.cpp index 7bd37315602..9bd8bf135fe 100644 --- a/lib/Transforms/Utils/CloneFunction.cpp +++ b/lib/Transforms/Utils/CloneFunction.cpp @@ -14,7 +14,7 @@ //===----------------------------------------------------------------------===// #include "llvm/Transforms/Utils/Cloning.h" -#include "llvm/iTerminators.h" +#include "llvm/Instructions.h" #include "llvm/DerivedTypes.h" #include "llvm/Function.h" #include "ValueMapper.h" diff --git a/lib/Transforms/Utils/CloneTrace.cpp b/lib/Transforms/Utils/CloneTrace.cpp index 94bfc3834b5..bfd7c6f6065 100644 --- a/lib/Transforms/Utils/CloneTrace.cpp +++ b/lib/Transforms/Utils/CloneTrace.cpp @@ -17,7 +17,7 @@ #include "llvm/Analysis/Trace.h" #include "llvm/Transforms/Utils/Cloning.h" -#include "llvm/iPHINode.h" +#include "llvm/Instructions.h" #include "llvm/Function.h" #include "ValueMapper.h" using namespace llvm; diff --git a/lib/Transforms/Utils/LoopSimplify.cpp b/lib/Transforms/Utils/LoopSimplify.cpp index ada858e1dda..2a4d88b99eb 100644 --- a/lib/Transforms/Utils/LoopSimplify.cpp +++ b/lib/Transforms/Utils/LoopSimplify.cpp @@ -34,8 +34,7 @@ #include "llvm/Transforms/Scalar.h" #include "llvm/Constant.h" -#include "llvm/iTerminators.h" -#include "llvm/iPHINode.h" +#include "llvm/Instructions.h" #include "llvm/Function.h" #include "llvm/Type.h" #include "llvm/Analysis/Dominators.h" diff --git a/lib/Transforms/Utils/LowerAllocations.cpp b/lib/Transforms/Utils/LowerAllocations.cpp index 27e0f70315d..a5197a0e01c 100644 --- a/lib/Transforms/Utils/LowerAllocations.cpp +++ b/lib/Transforms/Utils/LowerAllocations.cpp @@ -15,8 +15,7 @@ #include "llvm/Transforms/Scalar.h" #include "llvm/Module.h" #include "llvm/DerivedTypes.h" -#include "llvm/iMemory.h" -#include "llvm/iOther.h" +#include "llvm/Instructions.h" #include "llvm/Constants.h" #include "llvm/Pass.h" #include "Support/Statistic.h" diff --git a/lib/Transforms/Utils/Mem2Reg.cpp b/lib/Transforms/Utils/Mem2Reg.cpp index 0e411d21660..12dd5825253 100644 --- a/lib/Transforms/Utils/Mem2Reg.cpp +++ b/lib/Transforms/Utils/Mem2Reg.cpp @@ -15,7 +15,7 @@ #include "llvm/Transforms/Scalar.h" #include "llvm/Transforms/Utils/PromoteMemToReg.h" #include "llvm/Analysis/Dominators.h" -#include "llvm/iMemory.h" +#include "llvm/Instructions.h" #include "llvm/Function.h" #include "llvm/Target/TargetData.h" #include "Support/Statistic.h" diff --git a/lib/Transforms/Utils/PromoteMemoryToRegister.cpp b/lib/Transforms/Utils/PromoteMemoryToRegister.cpp index d35b457125e..ced2315e0e7 100644 --- a/lib/Transforms/Utils/PromoteMemoryToRegister.cpp +++ b/lib/Transforms/Utils/PromoteMemoryToRegister.cpp @@ -18,9 +18,7 @@ #include "llvm/Transforms/Utils/PromoteMemToReg.h" #include "llvm/Analysis/Dominators.h" -#include "llvm/iMemory.h" -#include "llvm/iPHINode.h" -#include "llvm/iOther.h" +#include "llvm/Instructions.h" #include "llvm/Function.h" #include "llvm/Constant.h" #include "llvm/Support/CFG.h" diff --git a/lib/VMCore/Constants.cpp b/lib/VMCore/Constants.cpp index 6d59b61d996..eed9cf11e67 100644 --- a/lib/VMCore/Constants.cpp +++ b/lib/VMCore/Constants.cpp @@ -15,7 +15,7 @@ #include "ConstantFolding.h" #include "llvm/DerivedTypes.h" #include "llvm/GlobalValue.h" -#include "llvm/iMemory.h" +#include "llvm/Instructions.h" #include "llvm/SymbolTable.h" #include "llvm/Module.h" #include "Support/StringExtras.h" diff --git a/lib/VMCore/InstrTypes.cpp b/lib/VMCore/InstrTypes.cpp index aa5c3514e25..5d0e727ccc6 100644 --- a/lib/VMCore/InstrTypes.cpp +++ b/lib/VMCore/InstrTypes.cpp @@ -11,8 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "llvm/iOther.h" -#include "llvm/iPHINode.h" +#include "llvm/Instructions.h" #include "llvm/Function.h" #include "llvm/SymbolTable.h" #include "llvm/Constant.h" diff --git a/lib/VMCore/Linker.cpp b/lib/VMCore/Linker.cpp index 4cd852cbb2f..64eb4888ddd 100644 --- a/lib/VMCore/Linker.cpp +++ b/lib/VMCore/Linker.cpp @@ -21,7 +21,7 @@ #include "llvm/DerivedTypes.h" #include "llvm/Module.h" #include "llvm/SymbolTable.h" -#include "llvm/iOther.h" +#include "llvm/Instructions.h" #include "llvm/Assembly/Writer.h" #include diff --git a/projects/Stacker/lib/compiler/StackerCompiler.cpp b/projects/Stacker/lib/compiler/StackerCompiler.cpp index 708ae3cc3a6..1ca88da7750 100644 --- a/projects/Stacker/lib/compiler/StackerCompiler.cpp +++ b/projects/Stacker/lib/compiler/StackerCompiler.cpp @@ -17,10 +17,7 @@ //===----------------------------------------------------------------------===// #include -#include -#include -#include -#include +#include #include #include "StackerCompiler.h" #include "StackerParser.h" diff --git a/projects/Stacker/lib/compiler/StackerParser.y b/projects/Stacker/lib/compiler/StackerParser.y index 96c724303e4..2256b30ccf7 100644 --- a/projects/Stacker/lib/compiler/StackerParser.y +++ b/projects/Stacker/lib/compiler/StackerParser.y @@ -15,10 +15,7 @@ #include "StackerCompiler.h" #include "llvm/SymbolTable.h" #include "llvm/Module.h" -#include "llvm/iTerminators.h" -#include "llvm/iMemory.h" -#include "llvm/iOperators.h" -#include "llvm/iPHINode.h" +#include "llvm/Instructions.h" #include "Support/STLExtras.h" #include "Support/DepthFirstIterator.h" #include diff --git a/tools/bugpoint/CrashDebugger.cpp b/tools/bugpoint/CrashDebugger.cpp index 92aa9964372..69837f9c2a8 100644 --- a/tools/bugpoint/CrashDebugger.cpp +++ b/tools/bugpoint/CrashDebugger.cpp @@ -14,7 +14,7 @@ #include "BugDriver.h" #include "ListReducer.h" #include "llvm/Constant.h" -#include "llvm/iTerminators.h" +#include "llvm/Instructions.h" #include "llvm/Module.h" #include "llvm/Pass.h" #include "llvm/PassManager.h" diff --git a/tools/bugpoint/TestPasses.cpp b/tools/bugpoint/TestPasses.cpp index 1a58e60804b..b95dbe7ec97 100644 --- a/tools/bugpoint/TestPasses.cpp +++ b/tools/bugpoint/TestPasses.cpp @@ -14,7 +14,7 @@ #include "llvm/BasicBlock.h" #include "llvm/Constant.h" -#include "llvm/iOther.h" +#include "llvm/Instructions.h" #include "llvm/Pass.h" #include "llvm/Support/InstVisitor.h"