Remove a ton of extraneous #includes

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@6842 91177308-0d34-0410-b5e6-96231b3b80d8

60 files changed, 16 insertions, 120 deletions

diff --git a/include/Support/CommandLine.h b/include/Support/CommandLine.h
index 728bb14678..ed2559bd2b 100644
--- a/include/Support/CommandLine.h
+++ b/include/Support/CommandLine.h
@@ -18,7 +18,6 @@
 #include <utility>
 #include <cstdarg>
 #include "boost/type_traits/object_traits.hpp"
-
 #include <assert.h>
 
 /// cl Namespace - This namespace contains all of the command line option
diff --git a/include/Support/SCCIterator.h b/include/Support/SCCIterator.h
index b7037701e0..a06e186a90 100644
--- a/include/Support/SCCIterator.h
+++ b/include/Support/SCCIterator.h
@@ -1,4 +1,4 @@
-//===-- Support/TarjanSCCIterator.h -Generic Tarjan SCC iterator -*- C++ -*--=//
+//===-- Support/TarjanSCCIterator.h - Tarjan SCC iterator -------*- C++ -*-===//
 //
 // This builds on the Support/GraphTraits.h file to find the strongly 
 // connected components (SCCs) of a graph in O(N+E) time using
@@ -9,18 +9,18 @@
 // 
 // To visit S1 *before* S2, use the TarjanSCCIterator on the Inverse graph.
 // (NOTE: This requires some simple wrappers and is not supported yet.)
+//
 //===----------------------------------------------------------------------===//
 
 #ifndef SUPPORT_TARJANSCCITERATOR_H
 #define SUPPORT_TARJANSCCITERATOR_H
 
 #include "Support/GraphTraits.h"
-#include <Support/Statistic.h>
-#include <Support/iterator>
+#include "Support/Statistic.h"
+#include "Support/iterator"
 #include <vector>
 #include <stack>
 #include <map>
-
 #include <assert.h>
 
 //--------------------------------------------------------------------------
diff --git a/include/Support/Timer.h b/include/Support/Timer.h
index 40ab643928..5cacadaf1c 100644
--- a/include/Support/Timer.h
+++ b/include/Support/Timer.h
@@ -28,7 +28,6 @@
 #include <string>
 #include <vector>
 #include <iosfwd>
-
 #include <assert.h>
 
 class TimerGroup;
@@ -64,7 +63,7 @@ public:
     PeakMemBase = T.PeakMemBase;
     Name = T.Name;
     Started = T.Started;
-    assert (TG == T.TG && "Can only assign timers in the same TimerGroup!");
+    assert(TG == T.TG && "Can only assign timers in the same TimerGroup!");
     return *this;
   }
 
diff --git a/include/Support/Tree.h b/include/Support/Tree.h
index 9979caaf31..7a3e9c4350 100644
--- a/include/Support/Tree.h
+++ b/include/Support/Tree.h
@@ -9,7 +9,6 @@
 #define SUPPORT_TREE_H
 
 #include <vector>
-
 #include <assert.h>
 
 template<class ConcreteTreeNode, class Payload>
diff --git a/include/llvm/ADT/SCCIterator.h b/include/llvm/ADT/SCCIterator.h
index b7037701e0..a06e186a90 100644
--- a/include/llvm/ADT/SCCIterator.h
+++ b/include/llvm/ADT/SCCIterator.h
@@ -1,4 +1,4 @@
-//===-- Support/TarjanSCCIterator.h -Generic Tarjan SCC iterator -*- C++ -*--=//
+//===-- Support/TarjanSCCIterator.h - Tarjan SCC iterator -------*- C++ -*-===//
 //
 // This builds on the Support/GraphTraits.h file to find the strongly 
 // connected components (SCCs) of a graph in O(N+E) time using
@@ -9,18 +9,18 @@
 // 
 // To visit S1 *before* S2, use the TarjanSCCIterator on the Inverse graph.
 // (NOTE: This requires some simple wrappers and is not supported yet.)
+//
 //===----------------------------------------------------------------------===//
 
 #ifndef SUPPORT_TARJANSCCITERATOR_H
 #define SUPPORT_TARJANSCCITERATOR_H
 
 #include "Support/GraphTraits.h"
-#include <Support/Statistic.h>
-#include <Support/iterator>
+#include "Support/Statistic.h"
+#include "Support/iterator"
 #include <vector>
 #include <stack>
 #include <map>
-
 #include <assert.h>
 
 //--------------------------------------------------------------------------
diff --git a/include/llvm/ADT/Tree.h b/include/llvm/ADT/Tree.h
index 9979caaf31..7a3e9c4350 100644
--- a/include/llvm/ADT/Tree.h
+++ b/include/llvm/ADT/Tree.h
@@ -9,7 +9,6 @@
 #define SUPPORT_TREE_H
 
 #include <vector>
-
 #include <assert.h>
 
 template<class ConcreteTreeNode, class Payload>
diff --git a/include/llvm/Analysis/AliasSetTracker.h b/include/llvm/Analysis/AliasSetTracker.h
index d2f22f36bb..45867ae916 100644
--- a/include/llvm/Analysis/AliasSetTracker.h
+++ b/include/llvm/Analysis/AliasSetTracker.h
@@ -10,8 +10,6 @@
 #ifndef LLVM_ANALYSIS_ALIASSETTRACKER_H
 #define LLVM_ANALYSIS_ALIASSETTRACKER_H
 
-#include <assert.h>
-
 #include "llvm/Support/CallSite.h"
 #include "Support/iterator"
 #include "Support/hash_map"
diff --git a/include/llvm/Analysis/CallGraph.h b/include/llvm/Analysis/CallGraph.h
index 69dc5cf442..fde7c82abb 100644
--- a/include/llvm/Analysis/CallGraph.h
+++ b/include/llvm/Analysis/CallGraph.h
@@ -41,8 +41,6 @@
 #ifndef LLVM_ANALYSIS_CALLGRAPH_H
 #define LLVM_ANALYSIS_CALLGRAPH_H
 
-#include <assert.h>
-
 #include "Support/GraphTraits.h"
 #include "Support/STLExtras.h"
 #include "llvm/Pass.h"
diff --git a/include/llvm/Analysis/ConstantsScanner.h b/include/llvm/Analysis/ConstantsScanner.h
index c3d112f27b..8035409bbf 100644
--- a/include/llvm/Analysis/ConstantsScanner.h
+++ b/include/llvm/Analysis/ConstantsScanner.h
@@ -9,8 +9,6 @@
 #ifndef LLVM_ANALYSIS_CONSTANTSSCANNER_H
 #define LLVM_ANALYSIS_CONSTANTSSCANNER_H
 
-#include <assert.h>
-
 #include "llvm/Support/InstIterator.h"
 #include "llvm/Instruction.h"
 #include "Support/iterator"
diff --git a/include/llvm/Analysis/DSGraph.h b/include/llvm/Analysis/DSGraph.h
index c1f941c735..9a897b2c97 100644
--- a/include/llvm/Analysis/DSGraph.h
+++ b/include/llvm/Analysis/DSGraph.h
@@ -7,8 +7,6 @@
 #ifndef LLVM_ANALYSIS_DSGRAPH_H
 #define LLVM_ANALYSIS_DSGRAPH_H
 
-#include <assert.h>
-
 #include "llvm/Analysis/DSNode.h"
 
 //===----------------------------------------------------------------------===//
diff --git a/include/llvm/Analysis/DSGraphTraits.h b/include/llvm/Analysis/DSGraphTraits.h
index 95cbbd7b0c..7ea30c02c0 100644
--- a/include/llvm/Analysis/DSGraphTraits.h
+++ b/include/llvm/Analysis/DSGraphTraits.h
@@ -9,8 +9,6 @@
 #ifndef LLVM_ANALYSIS_DSGRAPHTRAITS_H
 #define LLVM_ANALYSIS_DSGRAPHTRAITS_H
 
-#include <assert.h>
-
 #include "llvm/Analysis/DSGraph.h"
 #include "Support/GraphTraits.h"
 #include "Support/iterator"
diff --git a/include/llvm/Analysis/DSSupport.h b/include/llvm/Analysis/DSSupport.h
index cc989f7736..1e886fe7c2 100644
--- a/include/llvm/Analysis/DSSupport.h
+++ b/include/llvm/Analysis/DSSupport.h
@@ -7,11 +7,10 @@
 #ifndef LLVM_ANALYSIS_DSSUPPORT_H
 #define LLVM_ANALYSIS_DSSUPPORT_H
 
-#include <assert.h>
-
 #include <vector>
 #include <functional>
 #include <string>
+#include <assert.h>
 #include "Support/HashExtras.h"
 #include "Support/hash_set"
 
diff --git a/include/llvm/Analysis/DataStructure.h b/include/llvm/Analysis/DataStructure.h
index fad56d966c..ebcc3c5c64 100644
--- a/include/llvm/Analysis/DataStructure.h
+++ b/include/llvm/Analysis/DataStructure.h
@@ -7,8 +7,6 @@
 #ifndef LLVM_ANALYSIS_DATA_STRUCTURE_H
 #define LLVM_ANALYSIS_DATA_STRUCTURE_H
 
-#include <assert.h>
-
 #include "llvm/Pass.h"
 #include "Support/HashExtras.h"
 #include "Support/hash_set"
diff --git a/include/llvm/Analysis/DataStructure/DSGraph.h b/include/llvm/Analysis/DataStructure/DSGraph.h
index c1f941c735..9a897b2c97 100644
--- a/include/llvm/Analysis/DataStructure/DSGraph.h
+++ b/include/llvm/Analysis/DataStructure/DSGraph.h
@@ -7,8 +7,6 @@
 #ifndef LLVM_ANALYSIS_DSGRAPH_H
 #define LLVM_ANALYSIS_DSGRAPH_H
 
-#include <assert.h>
-
 #include "llvm/Analysis/DSNode.h"
 
 //===----------------------------------------------------------------------===//
diff --git a/include/llvm/Analysis/DataStructure/DSGraphTraits.h b/include/llvm/Analysis/DataStructure/DSGraphTraits.h
index 95cbbd7b0c..7ea30c02c0 100644
--- a/include/llvm/Analysis/DataStructure/DSGraphTraits.h
+++ b/include/llvm/Analysis/DataStructure/DSGraphTraits.h
@@ -9,8 +9,6 @@
 #ifndef LLVM_ANALYSIS_DSGRAPHTRAITS_H
 #define LLVM_ANALYSIS_DSGRAPHTRAITS_H
 
-#include <assert.h>
-
 #include "llvm/Analysis/DSGraph.h"
 #include "Support/GraphTraits.h"
 #include "Support/iterator"
diff --git a/include/llvm/Analysis/DataStructure/DSSupport.h b/include/llvm/Analysis/DataStructure/DSSupport.h
index cc989f7736..1e886fe7c2 100644
--- a/include/llvm/Analysis/DataStructure/DSSupport.h
+++ b/include/llvm/Analysis/DataStructure/DSSupport.h
@@ -7,11 +7,10 @@
 #ifndef LLVM_ANALYSIS_DSSUPPORT_H
 #define LLVM_ANALYSIS_DSSUPPORT_H
 
-#include <assert.h>
-
 #include <vector>
 #include <functional>
 #include <string>
+#include <assert.h>
 #include "Support/HashExtras.h"
 #include "Support/hash_set"
 
diff --git a/include/llvm/Analysis/DataStructure/DataStructure.h b/include/llvm/Analysis/DataStructure/DataStructure.h
index fad56d966c..ebcc3c5c64 100644
--- a/include/llvm/Analysis/DataStructure/DataStructure.h
+++ b/include/llvm/Analysis/DataStructure/DataStructure.h
@@ -7,8 +7,6 @@
 #ifndef LLVM_ANALYSIS_DATA_STRUCTURE_H
 #define LLVM_ANALYSIS_DATA_STRUCTURE_H
 
-#include <assert.h>
-
 #include "llvm/Pass.h"
 #include "Support/HashExtras.h"
 #include "Support/hash_set"
diff --git a/include/llvm/Analysis/DependenceGraph.h b/include/llvm/Analysis/DependenceGraph.h
index 10013f7f4c..65831f980c 100644
--- a/include/llvm/Analysis/DependenceGraph.h
+++ b/include/llvm/Analysis/DependenceGraph.h
@@ -14,7 +14,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-
 #ifndef LLVM_ANALYSIS_DEPENDENCEGRAPH_H
 #define LLVM_ANALYSIS_DEPENDENCEGRAPH_H
 
@@ -22,7 +21,6 @@
 #include <iosfwd>
 #include <vector>
 #include <utility>
-
 #include <assert.h>
 
 class Instruction;
diff --git a/include/llvm/Analysis/Dominators.h b/include/llvm/Analysis/Dominators.h
index 3a4c4080a3..7881d82125 100644
--- a/include/llvm/Analysis/Dominators.h
+++ b/include/llvm/Analysis/Dominators.h
@@ -20,7 +20,6 @@
 
 #include "llvm/Pass.h"
 #include <set>
-#include <assert.h>
 class Instruction;
 
 template <typename GraphType> struct GraphTraits;
diff --git a/include/llvm/Analysis/IPModRef.h b/include/llvm/Analysis/IPModRef.h
index a32203308c..eed264f978 100644
--- a/include/llvm/Analysis/IPModRef.h
+++ b/include/llvm/Analysis/IPModRef.h
@@ -39,8 +39,6 @@
 #ifndef LLVM_ANALYSIS_IPMODREF_H
 #define LLVM_ANALYSIS_IPMODREF_H
 
-#include <assert.h>
-
 #include "llvm/Pass.h"
 #include "Support/BitSetVector.h"
 #include "Support/hash_map"
diff --git a/include/llvm/Analysis/InstForest.h b/include/llvm/Analysis/InstForest.h
index 81b3506414..56a918bd43 100644
--- a/include/llvm/Analysis/InstForest.h
+++ b/include/llvm/Analysis/InstForest.h
@@ -14,12 +14,9 @@
 #ifndef LLVM_ANALYSIS_INSTFOREST_H
 #define LLVM_ANALYSIS_INSTFOREST_H
 
-#include "llvm/Instruction.h"
-#include "llvm/BasicBlock.h"
 #include "llvm/Function.h"
 #include "Support/Tree.h"
 #include <map>
-#include <assert.h>
 
 template<class Payload> class InstTreeNode;
 template<class Payload> class InstForest;
diff --git a/include/llvm/Analysis/IntervalIterator.h b/include/llvm/Analysis/IntervalIterator.h
index 6b50080691..09bfc92aeb 100644
--- a/include/llvm/Analysis/IntervalIterator.h
+++ b/include/llvm/Analysis/IntervalIterator.h
@@ -28,12 +28,10 @@
 
 #include "llvm/Analysis/IntervalPartition.h"
 #include "llvm/Function.h"
-#include "llvm/BasicBlock.h"
 #include "llvm/Support/CFG.h"
 #include <stack>
 #include <set>
 #include <algorithm>
-#include <assert.h>
 
 // getNodeHeader - Given a source graph node and the source graph, return the 
 // BasicBlock that is the header node.  This is the opposite of
diff --git a/include/llvm/Analysis/MemoryDepAnalysis.h b/include/llvm/Analysis/MemoryDepAnalysis.h
index 71adc123a5..4263f395e5 100644
--- a/include/llvm/Analysis/MemoryDepAnalysis.h
+++ b/include/llvm/Analysis/MemoryDepAnalysis.h
@@ -7,6 +7,7 @@
 //
 // The result of this pass is a DependenceGraph for each function
 // representing the memory-based data dependences between instructions.
+//
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_ANALYSIS_MEMORYDEPANALYSIS_H
@@ -17,17 +18,11 @@
 #include "llvm/Analysis/DataStructure.h"
 #include "llvm/Pass.h"
 #include "Support/TarjanSCCIterator.h"
-#include "Support/NonCopyable.h"
 #include "Support/hash_map"
 
-#include <assert.h>
-
 class Instruction;
-class Function;
-class DSGraph;
 class ModRefTable;
 
-
 ///---------------------------------------------------------------------------
 /// class MemoryDepGraph:
 ///   Dependence analysis for load/store/call instructions using IPModRef info
diff --git a/include/llvm/Analysis/PgmDependenceGraph.h b/include/llvm/Analysis/PgmDependenceGraph.h
index d5b2a148f2..25fa55f1fa 100644
--- a/include/llvm/Analysis/PgmDependenceGraph.h
+++ b/include/llvm/Analysis/PgmDependenceGraph.h
@@ -26,6 +26,7 @@
 //
 // class PgmDependenceGraph -- Interface to obtain PDGIterators for each
 //                          instruction.
+//
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_ANALYSIS_PGMDEPENDENCEGRAPH_H
@@ -35,15 +36,9 @@
 #include "llvm/Analysis/MemoryDepAnalysis.h"
 /* #include "llvm/Analysis/PostDominators.h" -- see below */
 #include "llvm/Instruction.h"
-#include "llvm/Value.h"
 #include "llvm/Pass.h"
-#include "Support/NonCopyable.h"
 #include <iterator>
 
-#include <assert.h>
-
-class Instruction;
-class Function;
 class DSGraph;
 class DependenceGraph;
 class PgmDependenceGraph;
diff --git a/include/llvm/CodeGen/InstrForest.h b/include/llvm/CodeGen/InstrForest.h
index d6eaf7673a..0b623d125e 100644
--- a/include/llvm/CodeGen/InstrForest.h
+++ b/include/llvm/CodeGen/InstrForest.h
@@ -21,10 +21,8 @@
 
 #include "llvm/Instruction.h"
 #include "Support/HashExtras.h"
-#include <assert.h>
 
 class Constant;
-class BasicBlock;
 class Function;
 class InstrTreeNode;
 class InstrForest;
diff --git a/include/llvm/CodeGen/InstrSelection.h b/include/llvm/CodeGen/InstrSelection.h
index a305578bfb..c1ed86ed43 100644
--- a/include/llvm/CodeGen/InstrSelection.h
+++ b/include/llvm/CodeGen/InstrSelection.h
@@ -8,7 +8,6 @@
 #define LLVM_CODEGEN_INSTR_SELECTION_H
 
 #include "llvm/Instruction.h"
-#include <assert.h>
 class Function;
 class InstrForest;
 class MachineInstr;
diff --git a/include/llvm/CodeGen/LiveVariables.h b/include/llvm/CodeGen/LiveVariables.h
index 881fce4b0d..51d3e82e77 100644
--- a/include/llvm/CodeGen/LiveVariables.h
+++ b/include/llvm/CodeGen/LiveVariables.h
@@ -24,7 +24,6 @@
 
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include <map>
-#include <assert.h>
 
 class MRegisterInfo;
 
diff --git a/include/llvm/CodeGen/MachineCodeForInstruction.h b/include/llvm/CodeGen/MachineCodeForInstruction.h
index 91b4dfdc5e..25994a94a3 100644
--- a/include/llvm/CodeGen/MachineCodeForInstruction.h
+++ b/include/llvm/CodeGen/MachineCodeForInstruction.h
@@ -20,7 +20,6 @@
 
 #include "Support/Annotation.h"
 #include <vector>
-#include <assert.h>
 
 class MachineInstr;
 class Instruction;
diff --git a/include/llvm/CodeGen/MachineInstr.h b/include/llvm/CodeGen/MachineInstr.h
index 3c2f9abc25..721b513c74 100644
--- a/include/llvm/CodeGen/MachineInstr.h
+++ b/include/llvm/CodeGen/MachineInstr.h
@@ -13,7 +13,6 @@
 #include "Support/Annotation.h"
 #include "Support/iterator"
 #include <set>
-#include <assert.h>
 
 class Value;
 class Function;
diff --git a/include/llvm/CodeGen/MachineInstrAnnot.h b/include/llvm/CodeGen/MachineInstrAnnot.h
index b7e22d8138..e1902e77b3 100644
--- a/include/llvm/CodeGen/MachineInstrAnnot.h
+++ b/include/llvm/CodeGen/MachineInstrAnnot.h
@@ -10,8 +10,6 @@
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/Target/TargetRegInfo.h"
 
-#include <assert.h>
-
 class Value;
 class TmpInstruction;
 class CallInst;
diff --git a/include/llvm/CodeGen/SSARegMap.h b/include/llvm/CodeGen/SSARegMap.h
index ced04354cf..b1b00ac049 100644
---