From 66a64fb9975898a802ec20e3ec3a1bd5f3eb6588 Mon Sep 17 00:00:00 2001
From: Chris Lattner <sabre@nondot.org>
Date: Thu, 29 Jul 2004 17:11:37 +0000
Subject: [PATCH] Fix #includes of i*.h => Instructions.h as per PR403:
 http://llvm.cs.uiuc.edu/PR403 .

llvm-svn: 15331
---
 llvm/lib/CodeGen/InstrSched/SchedGraph.cpp                | 2 +-
 llvm/lib/Target/SparcV9/InstrSelection/InstrForest.cpp    | 3 +--
 llvm/lib/Target/SparcV9/InstrSelection/InstrSelection.cpp | 3 +--
 llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp          | 3 +--
 llvm/lib/Target/SparcV9/SparcV9InstrInfo.cpp              | 2 +-
 llvm/lib/Target/SparcV9/SparcV9PreSelection.cpp           | 4 +---
 llvm/lib/Target/SparcV9/SparcV9RegInfo.cpp                | 3 +--
 7 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/llvm/lib/CodeGen/InstrSched/SchedGraph.cpp b/llvm/lib/CodeGen/InstrSched/SchedGraph.cpp
index 2c7a123c43c4..4913c2bfd45d 100644
--- a/llvm/lib/CodeGen/InstrSched/SchedGraph.cpp
+++ b/llvm/lib/CodeGen/InstrSched/SchedGraph.cpp
@@ -15,7 +15,7 @@
 
 #include "SchedGraph.h"
 #include "llvm/Function.h"
-#include "llvm/iOther.h"
+#include "llvm/Instructions.h"
 #include "llvm/CodeGen/MachineCodeForInstruction.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/Target/TargetInstrInfo.h"
diff --git a/llvm/lib/Target/SparcV9/InstrSelection/InstrForest.cpp b/llvm/lib/Target/SparcV9/InstrSelection/InstrForest.cpp
index 271857b80adc..ff9ebf27ec7a 100644
--- a/llvm/lib/Target/SparcV9/InstrSelection/InstrForest.cpp
+++ b/llvm/lib/Target/SparcV9/InstrSelection/InstrForest.cpp
@@ -21,8 +21,7 @@
 
 #include "llvm/Constant.h"
 #include "llvm/Function.h"
-#include "llvm/iTerminators.h"
-#include "llvm/iMemory.h"
+#include "llvm/Instructions.h"
 #include "llvm/Type.h"
 #include "llvm/CodeGen/InstrForest.h"
 #include "llvm/CodeGen/MachineInstr.h"
diff --git a/llvm/lib/Target/SparcV9/InstrSelection/InstrSelection.cpp b/llvm/lib/Target/SparcV9/InstrSelection/InstrSelection.cpp
index 0c12fe42271e..210dac578837 100644
--- a/llvm/lib/Target/SparcV9/InstrSelection/InstrSelection.cpp
+++ b/llvm/lib/Target/SparcV9/InstrSelection/InstrSelection.cpp
@@ -16,8 +16,7 @@
 
 #include "llvm/CodeGen/InstrSelection.h"
 #include "llvm/Function.h"
-#include "llvm/iPHINode.h"
-#include "llvm/iOther.h"
+#include "llvm/Instructions.h"
 #include "llvm/Pass.h"
 #include "llvm/CodeGen/InstrForest.h"
 #include "llvm/CodeGen/IntrinsicLowering.h"
diff --git a/llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp b/llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp
index 99d0e7cc0ef9..38ef2acc67ae 100644
--- a/llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp
+++ b/llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp
@@ -29,8 +29,7 @@
 #include "../SparcV9InstrInfo.h"
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
-#include "llvm/iPHINode.h"
-#include "llvm/iOther.h"
+#include "llvm/Instructions.h"
 #include "llvm/Module.h"
 #include "llvm/Type.h"
 #include "llvm/Analysis/LoopInfo.h"
diff --git a/llvm/lib/Target/SparcV9/SparcV9InstrInfo.cpp b/llvm/lib/Target/SparcV9/SparcV9InstrInfo.cpp
index 80a66fba244f..239758fa7ed4 100644
--- a/llvm/lib/Target/SparcV9/SparcV9InstrInfo.cpp
+++ b/llvm/lib/Target/SparcV9/SparcV9InstrInfo.cpp
@@ -16,7 +16,7 @@
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Function.h"
-#include "llvm/iTerminators.h"
+#include "llvm/Instructions.h"
 #include "llvm/CodeGen/InstrSelection.h"
 #include "llvm/CodeGen/MachineConstantPool.h"
 #include "llvm/CodeGen/MachineFunction.h"
diff --git a/llvm/lib/Target/SparcV9/SparcV9PreSelection.cpp b/llvm/lib/Target/SparcV9/SparcV9PreSelection.cpp
index 97fa212e9547..da1c2ba1c9c1 100644
--- a/llvm/lib/Target/SparcV9/SparcV9PreSelection.cpp
+++ b/llvm/lib/Target/SparcV9/SparcV9PreSelection.cpp
@@ -19,9 +19,7 @@
 #include "SparcV9InstrSelectionSupport.h"
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
-#include "llvm/iMemory.h"
-#include "llvm/iPHINode.h"
-#include "llvm/iOther.h"
+#include "llvm/Instructions.h"
 #include "llvm/Module.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/InstVisitor.h"
diff --git a/llvm/lib/Target/SparcV9/SparcV9RegInfo.cpp b/llvm/lib/Target/SparcV9/SparcV9RegInfo.cpp
index e16db9f99d29..c74f6614dee2 100644
--- a/llvm/lib/Target/SparcV9/SparcV9RegInfo.cpp
+++ b/llvm/lib/Target/SparcV9/SparcV9RegInfo.cpp
@@ -22,8 +22,7 @@
 #include "RegAlloc/LiveRange.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Function.h"
-#include "llvm/iTerminators.h"
-#include "llvm/iOther.h"
+#include "llvm/Instructions.h"
 #include "SparcV9Internals.h"
 #include "SparcV9RegClassInfo.h"
 #include "SparcV9RegInfo.h"