From d0fde30ce850b78371fd1386338350591f9ff494 Mon Sep 17 00:00:00 2001 From: Brian Gaeke Date: Tue, 11 Nov 2003 22:41:34 +0000 Subject: Put all LLVM code into the llvm namespace, as per bug 109. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@9903 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Analysis/AliasAnalysis.h | 5 +++++ include/llvm/Analysis/AliasSetTracker.h | 5 +++++ include/llvm/Analysis/CallGraph.h | 5 +++++ include/llvm/Analysis/ConstantsScanner.h | 5 +++++ include/llvm/Analysis/DSGraph.h | 5 +++++ include/llvm/Analysis/DSGraphTraits.h | 4 ++++ include/llvm/Analysis/DSNode.h | 4 ++++ include/llvm/Analysis/DSSupport.h | 12 ++++++++++-- include/llvm/Analysis/DataStructure.h | 4 ++++ include/llvm/Analysis/DataStructure/DSGraph.h | 5 +++++ include/llvm/Analysis/DataStructure/DSGraphTraits.h | 4 ++++ include/llvm/Analysis/DataStructure/DSNode.h | 4 ++++ include/llvm/Analysis/DataStructure/DSSupport.h | 12 ++++++++++-- include/llvm/Analysis/DataStructure/DataStructure.h | 4 ++++ include/llvm/Analysis/DependenceGraph.h | 4 ++++ include/llvm/Analysis/Dominators.h | 4 ++++ include/llvm/Analysis/Expressions.h | 4 ++++ include/llvm/Analysis/FindUnsafePointerTypes.h | 4 ++++ include/llvm/Analysis/FindUsedTypes.h | 5 +++++ include/llvm/Analysis/IPModRef.h | 4 ++++ include/llvm/Analysis/InductionVariable.h | 5 +++++ include/llvm/Analysis/InstForest.h | 4 ++++ include/llvm/Analysis/Interval.h | 4 ++++ include/llvm/Analysis/IntervalIterator.h | 4 ++++ include/llvm/Analysis/IntervalPartition.h | 4 ++++ include/llvm/Analysis/LoadValueNumbering.h | 4 ++++ include/llvm/Analysis/LoopInfo.h | 4 ++++ include/llvm/Analysis/MemoryDepAnalysis.h | 4 ++++ include/llvm/Analysis/PgmDependenceGraph.h | 5 ++++- include/llvm/Analysis/PostDominators.h | 4 ++++ include/llvm/Analysis/SlotCalculator.h | 5 +++++ include/llvm/Analysis/ValueNumbering.h | 5 +++++ include/llvm/Analysis/Verifier.h | 4 ++++ 33 files changed, 154 insertions(+), 5 deletions(-) (limited to 'include/llvm/Analysis') diff --git a/include/llvm/Analysis/AliasAnalysis.h b/include/llvm/Analysis/AliasAnalysis.h index 4ce3f4b..dc484f5 100644 --- a/include/llvm/Analysis/AliasAnalysis.h +++ b/include/llvm/Analysis/AliasAnalysis.h @@ -31,6 +31,9 @@ #define LLVM_ANALYSIS_ALIAS_ANALYSIS_H #include "llvm/Support/CallSite.h" + +namespace llvm { + class LoadInst; class StoreInst; class TargetData; @@ -156,4 +159,6 @@ public: const Value *Ptr, unsigned Size); }; +} // End llvm namespace + #endif diff --git a/include/llvm/Analysis/AliasSetTracker.h b/include/llvm/Analysis/AliasSetTracker.h index 72168b4..fe57c28 100644 --- a/include/llvm/Analysis/AliasSetTracker.h +++ b/include/llvm/Analysis/AliasSetTracker.h @@ -21,6 +21,9 @@ #include "Support/iterator" #include "Support/hash_map" #include "Support/ilist" + +namespace llvm { + class AliasAnalysis; class LoadInst; class StoreInst; @@ -283,4 +286,6 @@ inline std::ostream& operator<<(std::ostream &OS, const AliasSetTracker &AST) { return OS; } +} // End llvm namespace + #endif diff --git a/include/llvm/Analysis/CallGraph.h b/include/llvm/Analysis/CallGraph.h index 3a51b05..60649f9 100644 --- a/include/llvm/Analysis/CallGraph.h +++ b/include/llvm/Analysis/CallGraph.h @@ -51,6 +51,9 @@ #include "Support/GraphTraits.h" #include "Support/STLExtras.h" #include "llvm/Pass.h" + +namespace llvm { + class Function; class Module; class CallGraphNode; @@ -288,4 +291,6 @@ template<> struct GraphTraits : static IncludeFile CALLGRAPH_INCLUDE_FILE((void*)&CallGraph::stub); +} // End llvm namespace + #endif diff --git a/include/llvm/Analysis/ConstantsScanner.h b/include/llvm/Analysis/ConstantsScanner.h index c7efd76..e1533c3 100644 --- a/include/llvm/Analysis/ConstantsScanner.h +++ b/include/llvm/Analysis/ConstantsScanner.h @@ -19,6 +19,9 @@ #include "llvm/Support/InstIterator.h" #include "llvm/Instruction.h" #include "Support/iterator" + +namespace llvm { + class Constant; class constant_iterator : public forward_iterator { @@ -86,4 +89,6 @@ inline constant_iterator constant_end(const Function *F) { return constant_iterator(F, true); } +} // End llvm namespace + #endif diff --git a/include/llvm/Analysis/DSGraph.h b/include/llvm/Analysis/DSGraph.h index 399da00..b7fdb10 100644 --- a/include/llvm/Analysis/DSGraph.h +++ b/include/llvm/Analysis/DSGraph.h @@ -15,6 +15,9 @@ #define LLVM_ANALYSIS_DSGRAPH_H #include "llvm/Analysis/DSNode.h" + +namespace llvm { + class GlobalValue; //===----------------------------------------------------------------------===// @@ -332,4 +335,6 @@ public: void removeTriviallyDeadNodes(); }; +} // End llvm namespace + #endif diff --git a/include/llvm/Analysis/DSGraphTraits.h b/include/llvm/Analysis/DSGraphTraits.h index 086835c..ad2cc6f 100644 --- a/include/llvm/Analysis/DSGraphTraits.h +++ b/include/llvm/Analysis/DSGraphTraits.h @@ -21,6 +21,8 @@ #include "Support/iterator" #include "Support/STLExtras.h" +namespace llvm { + template class DSNodeIterator : public forward_iterator { friend class DSNode; @@ -146,4 +148,6 @@ template <> struct GraphTraits { static ChildIteratorType child_end(const NodeType *N) { return N->end(); } }; +} // End llvm namespace + #endif diff --git a/include/llvm/Analysis/DSNode.h b/include/llvm/Analysis/DSNode.h index ba5328b..f206c3e 100644 --- a/include/llvm/Analysis/DSNode.h +++ b/include/llvm/Analysis/DSNode.h @@ -16,6 +16,8 @@ #include "llvm/Analysis/DSSupport.h" +namespace llvm { + template class DSNodeIterator; // Data structure graph traversal iterator class TargetData; @@ -382,4 +384,6 @@ inline void DSNodeHandle::mergeWith(const DSNodeHandle &Node) { *this = Node; } +} // End llvm namespace + #endif diff --git a/include/llvm/Analysis/DSSupport.h b/include/llvm/Analysis/DSSupport.h index e5662ff..4b57191 100644 --- a/include/llvm/Analysis/DSSupport.h +++ b/include/llvm/Analysis/DSSupport.h @@ -18,6 +18,8 @@ #include "Support/hash_set" #include "llvm/Support/CallSite.h" +namespace llvm { + class Function; class CallInst; class Value; @@ -122,10 +124,14 @@ private: DSNode *HandleForwarding() const; }; +} // End llvm namespace + namespace std { - inline void swap(DSNodeHandle &NH1, DSNodeHandle &NH2) { NH1.swap(NH2); } + inline void swap(llvm::DSNodeHandle &NH1, llvm::DSNodeHandle &NH2) { NH1.swap(NH2); } } +namespace llvm { + //===----------------------------------------------------------------------===// /// DSCallSite - Representation of a call site via its call instruction, /// the DSNode handle for the callee function (or function pointer), and @@ -287,7 +293,9 @@ public: } }; +} // End llvm namespace + namespace std { - inline void swap(DSCallSite &CS1, DSCallSite &CS2) { CS1.swap(CS2); } + inline void swap(llvm::DSCallSite &CS1, llvm::DSCallSite &CS2) { CS1.swap(CS2); } } #endif diff --git a/include/llvm/Analysis/DataStructure.h b/include/llvm/Analysis/DataStructure.h index afea126..4d6e3a0 100644 --- a/include/llvm/Analysis/DataStructure.h +++ b/include/llvm/Analysis/DataStructure.h @@ -18,6 +18,8 @@ #include "llvm/Target/TargetData.h" #include "Support/hash_set" +namespace llvm { + class Type; class Instruction; class DSGraph; @@ -184,4 +186,6 @@ private: const BUDataStructures::ActualCalleesTy &ActualCallees); }; +} // End llvm namespace + #endif diff --git a/include/llvm/Analysis/DataStructure/DSGraph.h b/include/llvm/Analysis/DataStructure/DSGraph.h index 399da00..b7fdb10 100644 --- a/include/llvm/Analysis/DataStructure/DSGraph.h +++ b/include/llvm/Analysis/DataStructure/DSGraph.h @@ -15,6 +15,9 @@ #define LLVM_ANALYSIS_DSGRAPH_H #include "llvm/Analysis/DSNode.h" + +namespace llvm { + class GlobalValue; //===----------------------------------------------------------------------===// @@ -332,4 +335,6 @@ public: void removeTriviallyDeadNodes(); }; +} // End llvm namespace + #endif diff --git a/include/llvm/Analysis/DataStructure/DSGraphTraits.h b/include/llvm/Analysis/DataStructure/DSGraphTraits.h index 086835c..ad2cc6f 100644 --- a/include/llvm/Analysis/DataStructure/DSGraphTraits.h +++ b/include/llvm/Analysis/DataStructure/DSGraphTraits.h @@ -21,6 +21,8 @@ #include "Support/iterator" #include "Support/STLExtras.h" +namespace llvm { + template class DSNodeIterator : public forward_iterator { friend class DSNode; @@ -146,4 +148,6 @@ template <> struct GraphTraits { static ChildIteratorType child_end(const NodeType *N) { return N->end(); } }; +} // End llvm namespace + #endif diff --git a/include/llvm/Analysis/DataStructure/DSNode.h b/include/llvm/Analysis/DataStructure/DSNode.h index ba5328b..f206c3e 100644 --- a/include/llvm/Analysis/DataStructure/DSNode.h +++ b/include/llvm/Analysis/DataStructure/DSNode.h @@ -16,6 +16,8 @@ #include "llvm/Analysis/DSSupport.h" +namespace llvm { + template class DSNodeIterator; // Data structure graph traversal iterator class TargetData; @@ -382,4 +384,6 @@ inline void DSNodeHandle::mergeWith(const DSNodeHandle &Node) { *this = Node; } +} // End llvm namespace + #endif diff --git a/include/llvm/Analysis/DataStructure/DSSupport.h b/include/llvm/Analysis/DataStructure/DSSupport.h index e5662ff..4b57191 100644 --- a/include/llvm/Analysis/DataStructure/DSSupport.h +++ b/include/llvm/Analysis/DataStructure/DSSupport.h @@ -18,6 +18,8 @@ #include "Support/hash_set" #include "llvm/Support/CallSite.h" +namespace llvm { + class Function; class CallInst; class Value; @@ -122,10 +124,14 @@ private: DSNode *HandleForwarding() const; }; +} // End llvm namespace + namespace std { - inline void swap(DSNodeHandle &NH1, DSNodeHandle &NH2) { NH1.swap(NH2); } + inline void swap(llvm::DSNodeHandle &NH1, llvm::DSNodeHandle &NH2) { NH1.swap(NH2); } } +namespace llvm { + //===----------------------------------------------------------------------===// /// DSCallSite - Representation of a call site via its call instruction, /// the DSNode handle for the callee function (or function pointer), and @@ -287,7 +293,9 @@ public: } }; +} // End llvm namespace + namespace std { - inline void swap(DSCallSite &CS1, DSCallSite &CS2) { CS1.swap(CS2); } + inline void swap(llvm::DSCallSite &CS1, llvm::DSCallSite &CS2) { CS1.swap(CS2); } } #endif diff --git a/include/llvm/Analysis/DataStructure/DataStructure.h b/include/llvm/Analysis/DataStructure/DataStructure.h index afea126..4d6e3a0 100644 --- a/include/llvm/Analysis/DataStructure/DataStructure.h +++ b/include/llvm/Analysis/DataStructure/DataStructure.h @@ -18,6 +18,8 @@ #include "llvm/Target/TargetData.h" #include "Support/hash_set" +namespace llvm { + class Type; class Instruction; class DSGraph; @@ -184,4 +186,6 @@ private: const BUDataStructures::ActualCalleesTy &ActualCallees); }; +} // End llvm namespace + #endif diff --git a/include/llvm/Analysis/DependenceGraph.h b/include/llvm/Analysis/DependenceGraph.h index b5af0b9..b4c7aa1 100644 --- a/include/llvm/Analysis/DependenceGraph.h +++ b/include/llvm/Analysis/DependenceGraph.h @@ -30,6 +30,8 @@ #include #include +namespace llvm { + class Instruction; class Function; class Dependence; @@ -264,4 +266,6 @@ public: //===----------------------------------------------------------------------===// +} // End llvm namespace + #endif diff --git a/include/llvm/Analysis/Dominators.h b/include/llvm/Analysis/Dominators.h index b8ac9c3..5688d6e 100644 --- a/include/llvm/Analysis/Dominators.h +++ b/include/llvm/Analysis/Dominators.h @@ -28,6 +28,8 @@ #include "llvm/Pass.h" #include +namespace llvm { + class Instruction; template struct GraphTraits; @@ -487,4 +489,6 @@ private: const DominatorTree::Node *Node); }; +} // End llvm namespace + #endif diff --git a/include/llvm/Analysis/Expressions.h b/include/llvm/Analysis/Expressions.h index 2920761..77475ff 100644 --- a/include/llvm/Analysis/Expressions.h +++ b/include/llvm/Analysis/Expressions.h @@ -17,6 +17,8 @@ #ifndef LLVM_ANALYSIS_EXPRESSIONS_H #define LLVM_ANALYSIS_EXPRESSIONS_H +namespace llvm { + class Type; class Value; class ConstantInt; @@ -56,4 +58,6 @@ struct ExprType { const Type *getExprType(const Type *Default) const; }; +} // End llvm namespace + #endif diff --git a/include/llvm/Analysis/FindUnsafePointerTypes.h b/include/llvm/Analysis/FindUnsafePointerTypes.h index 8f1cdcf..62077f3 100644 --- a/include/llvm/Analysis/FindUnsafePointerTypes.h +++ b/include/llvm/Analysis/FindUnsafePointerTypes.h @@ -27,6 +27,8 @@ #include "llvm/Pass.h" #include +namespace llvm { + class PointerType; struct FindUnsafePointerTypes : public Pass { @@ -55,4 +57,6 @@ public: } }; +} // End llvm namespace + #endif diff --git a/include/llvm/Analysis/FindUsedTypes.h b/include/llvm/Analysis/FindUsedTypes.h index a246084..6947179 100644 --- a/include/llvm/Analysis/FindUsedTypes.h +++ b/include/llvm/Analysis/FindUsedTypes.h @@ -16,6 +16,9 @@ #include "llvm/Pass.h" #include + +namespace llvm { + class Type; class FindUsedTypes : public Pass { @@ -59,4 +62,6 @@ public: static IncludeFile FIND_USED_TYPES_INCLUDE_FILE((void*)&FindUsedTypes::stub); +} // End llvm namespace + #endif diff --git a/include/llvm/Analysis/IPModRef.h b/include/llvm/Analysis/IPModRef.h index 84e5519..cf70d58 100644 --- a/include/llvm/Analysis/IPModRef.h +++ b/include/llvm/Analysis/IPModRef.h @@ -50,6 +50,8 @@ #include "Support/BitSetVector.h" #include "Support/hash_map" +namespace llvm { + class Module; class Function; class CallSite; @@ -239,4 +241,6 @@ public: //===----------------------------------------------------------------------===// +} // End llvm namespace + #endif diff --git a/include/llvm/Analysis/InductionVariable.h b/include/llvm/Analysis/InductionVariable.h index 26deb83..6c06a6c 100644 --- a/include/llvm/Analysis/InductionVariable.h +++ b/include/llvm/Analysis/InductionVariable.h @@ -27,6 +27,9 @@ #define LLVM_ANALYSIS_INDUCTIONVARIABLE_H #include + +namespace llvm { + class Value; class PHINode; class Instruction; @@ -60,4 +63,6 @@ public: void print(std::ostream &OS) const; }; +} // End llvm namespace + #endif diff --git a/include/llvm/Analysis/InstForest.h b/include/llvm/Analysis/InstForest.h index a034c92..82fc46e 100644 --- a/include/llvm/Analysis/InstForest.h +++ b/include/llvm/Analysis/InstForest.h @@ -25,6 +25,8 @@ #include "Support/Tree.h" #include +namespace llvm { + template class InstTreeNode; template class InstForest; @@ -288,5 +290,7 @@ InstTreeNode::InstTreeNode(InstForest &IF, Value *V, getTreeData().first.second = InstructionNode; } +} // End llvm namespace + #endif diff --git a/include/llvm/Analysis/Interval.h b/include/llvm/Analysis/Interval.h index 9839cf5..0d59123 100644 --- a/include/llvm/Analysis/Interval.h +++ b/include/llvm/Analysis/Interval.h @@ -24,6 +24,8 @@ #include #include +namespace llvm { + class BasicBlock; //===----------------------------------------------------------------------===// @@ -146,4 +148,6 @@ template <> struct GraphTraits > { } }; +} // End llvm namespace + #endif diff --git a/include/llvm/Analysis/IntervalIterator.h b/include/llvm/Analysis/IntervalIterator.h index 2d67ded..091959f 100644 --- a/include/llvm/Analysis/IntervalIterator.h +++ b/include/llvm/Analysis/IntervalIterator.h @@ -40,6 +40,8 @@ #include #include +namespace llvm { + // getNodeHeader - Given a source graph node and the source graph, return the // BasicBlock that is the header node. This is the opposite of // getSourceGraphNode. @@ -253,4 +255,6 @@ inline interval_part_interval_iterator intervals_end(IntervalPartition &IP) { return interval_part_interval_iterator(); } +} // End llvm namespace + #endif diff --git a/include/llvm/Analysis/IntervalPartition.h b/include/llvm/Analysis/IntervalPartition.h index 45e282a..408ace2 100644 --- a/include/llvm/Analysis/IntervalPartition.h +++ b/include/llvm/Analysis/IntervalPartition.h @@ -26,6 +26,8 @@ #include "llvm/Analysis/Interval.h" #include "llvm/Pass.h" +namespace llvm { + //===----------------------------------------------------------------------===// // // IntervalPartition - This class builds and holds an "interval partition" for @@ -102,4 +104,6 @@ private: void updatePredecessors(Interval *Int); }; +} // End llvm namespace + #endif diff --git a/include/llvm/Analysis/LoadValueNumbering.h b/include/llvm/Analysis/LoadValueNumbering.h index 83aa5e9..6218133 100644 --- a/include/llvm/Analysis/LoadValueNumbering.h +++ b/include/llvm/Analysis/LoadValueNumbering.h @@ -21,6 +21,8 @@ #ifndef LLVM_ANALYSIS_LOAD_VALUE_NUMBERING_H #define LLVM_ANALYSIS_LOAD_VALUE_NUMBERING_H +namespace llvm { + class Pass; /// createLoadValueNumberingPass - Create and return a new pass that implements @@ -28,4 +30,6 @@ class Pass; /// Pass *createLoadValueNumberingPass(); +} // End llvm namespace + #endif diff --git a/include/llvm/Analysis/LoopInfo.h b/include/llvm/Analysis/LoopInfo.h index 6a96834..1458b3b 100644 --- a/include/llvm/Analysis/LoopInfo.h +++ b/include/llvm/Analysis/LoopInfo.h @@ -29,6 +29,8 @@ #include "Support/GraphTraits.h" #include +namespace llvm { + class DominatorSet; class LoopInfo; @@ -224,4 +226,6 @@ template <> struct GraphTraits { } }; +} // End llvm namespace + #endif diff --git a/include/llvm/Analysis/MemoryDepAnalysis.h b/include/llvm/Analysis/MemoryDepAnalysis.h index 6ecc3c8..10eb656 100644 --- a/include/llvm/Analysis/MemoryDepAnalysis.h +++ b/include/llvm/Analysis/MemoryDepAnalysis.h @@ -24,6 +24,8 @@ #include "llvm/Pass.h" #include "Support/hash_map" +namespace llvm { + class ModRefTable; class DSGraph; class FunctionModRefInfo; @@ -96,4 +98,6 @@ public: void dump() const; }; +} // End llvm namespace + #endif diff --git a/include/llvm/Analysis/PgmDependenceGraph.h b/include/llvm/Analysis/PgmDependenceGraph.h index edb5119..7012874 100644 --- a/include/llvm/Analysis/PgmDependenceGraph.h +++ b/include/llvm/Analysis/PgmDependenceGraph.h @@ -46,6 +46,8 @@ #include "llvm/Pass.h" #include "Support/iterator" +namespace llvm { + class DSGraph; class DependenceGraph; class PgmDependenceGraph; @@ -304,7 +306,8 @@ public: void dump() const; }; - //===----------------------------------------------------------------------===// +} // End llvm namespace + #endif diff --git a/include/llvm/Analysis/PostDominators.h b/include/llvm/Analysis/PostDominators.h index b1a9b8e..c8eb439 100644 --- a/include/llvm/Analysis/PostDominators.h +++ b/include/llvm/Analysis/PostDominators.h @@ -16,6 +16,8 @@ #include "llvm/Analysis/Dominators.h" +namespace llvm { + /// PostDominatorSet Class - Concrete subclass of DominatorSetBase that is used /// to compute the post-dominator set. Because there can be multiple exit nodes @@ -117,4 +119,6 @@ private: static IncludeFile POST_DOMINATOR_INCLUDE_FILE((void*)&PostDominanceFrontier::stub); +} // End llvm namespace + #endif diff --git a/include/llvm/Analysis/SlotCalculator.h b/include/llvm/Analysis/SlotCalculator.h index 7e56de9..596f932 100644 --- a/include/llvm/Analysis/SlotCalculator.h +++ b/include/llvm/Analysis/SlotCalculator.h @@ -22,6 +22,9 @@ #include #include + +namespace llvm { + class Value; class Module; class Function; @@ -92,4 +95,6 @@ protected: void processSymbolTableConstants(const SymbolTable *ST); }; +} // End llvm namespace + #endif diff --git a/include/llvm/Analysis/ValueNumbering.h b/include/llvm/Analysis/ValueNumbering.h index ff4680d..74b5c97 100644 --- a/include/llvm/Analysis/ValueNumbering.h +++ b/include/llvm/Analysis/ValueNumbering.h @@ -21,6 +21,9 @@ #define LLVM_ANALYSIS_VALUE_NUMBERING_H #include + +namespace llvm { + class Value; struct ValueNumbering { @@ -34,4 +37,6 @@ struct ValueNumbering { virtual ~ValueNumbering(); // We want to be subclassed }; +} // End llvm namespace + #endif diff --git a/include/llvm/Analysis/Verifier.h b/include/llvm/Analysis/Verifier.h index 427015c..51da3a5 100644 --- a/include/llvm/Analysis/Verifier.h +++ b/include/llvm/Analysis/Verifier.h @@ -21,6 +21,8 @@ #ifndef LLVM_ANALYSIS_VERIFIER_H #define LLVM_ANALYSIS_VERIFIER_H +namespace llvm { + class FunctionPass; class Module; class Function; @@ -40,4 +42,6 @@ bool verifyModule(const Module &M); // pass. bool verifyFunction(const Function &F); +} // End llvm namespace + #endif -- cgit v1.1