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

@@ -135,7 +135,7 @@ necessary.</p>
 <li><tt>llvm/include/llvm/Instruction.def</tt>:
     add a number for your instruction and an enum name</li>
 
-<li><tt>llvm/include/llvm/i*.h</tt>:
+<li><tt>llvm/include/llvm/Instructions.h</tt>:
     add a definition for the class that will represent your instruction</li>
 
 <li><tt>llvm/include/llvm/Support/InstVisitor.h</tt>:

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 <iostream>
 using namespace llvm;

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"

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"

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"

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"

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;

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"

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"

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 <iostream>
 
 using namespace llvm;

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"

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;
 

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 <iostream>
 

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"

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"

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"

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"

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 <set>

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"

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"
 

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

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 <algorithm>
 

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 <algorithm>
 #include "Graph.h"

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"
 

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 <fstream>

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 <iostream>

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 <set>

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"

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"

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 <algorithm>

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"

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"

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;

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"

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"

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"

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"

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"

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"

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 <iostream>
 

projects/Stacker/lib/compiler/StackerCompiler.cpp

@@ -17,10 +17,7 @@
 //===----------------------------------------------------------------------===//
 
 #include <llvm/Analysis/Verifier.h>
-#include <llvm/iMemory.h>
-#include <llvm/iOperators.h>
-#include <llvm/iOther.h>
-#include <llvm/iTerminators.h>
+#include <llvm/Instructions.h>
 #include <Support/Statistic.h>
 #include "StackerCompiler.h"
 #include "StackerParser.h"

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 <list>

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"

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"