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
diff --git a/lib/Analysis/DataStructure/BottomUpClosure.cpp b/lib/Analysis/DataStructure/BottomUpClosure.cpp
index b4b2e48..66990fd 100644
--- a/lib/Analysis/DataStructure/BottomUpClosure.cpp
+++ b/lib/Analysis/DataStructure/BottomUpClosure.cpp
@@ -20,6 +20,8 @@
#include "Support/Debug.h"
#include "DSCallSiteIterator.h"
+namespace llvm {
+
namespace {
Statistic<> MaxSCC("budatastructure", "Maximum SCC Size in Call Graph");
Statistic<> NumBUInlines("budatastructures", "Number of graphs inlined");
@@ -316,3 +318,4 @@
//Graph.writeGraphToFile(std::cerr, "bu_" + F.getName());
}
+} // End llvm namespace
diff --git a/lib/Analysis/DataStructure/DSCallSiteIterator.h b/lib/Analysis/DataStructure/DSCallSiteIterator.h
index 324111c..df9f369 100644
--- a/lib/Analysis/DataStructure/DSCallSiteIterator.h
+++ b/lib/Analysis/DataStructure/DSCallSiteIterator.h
@@ -19,6 +19,8 @@
#include "llvm/Analysis/DSGraph.h"
#include "llvm/Function.h"
+namespace llvm {
+
struct DSCallSiteIterator {
// FCs are the edges out of the current node are the call site targets...
const std::vector<DSCallSite> *FCs;
@@ -129,4 +131,6 @@
}
};
+} // End llvm namespace
+
#endif
diff --git a/lib/Analysis/DataStructure/DataStructure.cpp b/lib/Analysis/DataStructure/DataStructure.cpp
index d53c7fa..9cf77ae 100644
--- a/lib/Analysis/DataStructure/DataStructure.cpp
+++ b/lib/Analysis/DataStructure/DataStructure.cpp
@@ -23,6 +23,8 @@
#include "Support/Timer.h"
#include <algorithm>
+namespace llvm {
+
namespace {
Statistic<> NumFolds ("dsnode", "Number of nodes completely folded");
Statistic<> NumCallNodesMerged("dsnode", "Number of call nodes merged");
@@ -161,7 +163,6 @@
return getSize() == 1 && Ty == Type::VoidTy && isArray();
}
-
namespace {
/// TypeElementWalker Class - Used for implementation of physical subtyping...
///
@@ -252,7 +253,7 @@
}
}
};
-}
+} // end anonymous namespace
/// ElementTypesAreCompatible - Check to see if the specified types are
/// "physically" compatible. If so, return true, else return false. We only
@@ -1639,6 +1640,7 @@
removeTriviallyDeadNodes();
}
+
/// computeNodeMapping - Given roots in two different DSGraphs, traverse the
/// nodes reachable from the two graphs, computing the mapping of nodes from
/// the first to the second graph.
@@ -1669,3 +1671,4 @@
computeNodeMapping(N1->getLink(i), N2->getLink(N2Idx+i), NodeMap);
}
+} // End llvm namespace
diff --git a/lib/Analysis/DataStructure/DataStructureAA.cpp b/lib/Analysis/DataStructure/DataStructureAA.cpp
index 99773e3..4b55da7 100644
--- a/lib/Analysis/DataStructure/DataStructureAA.cpp
+++ b/lib/Analysis/DataStructure/DataStructureAA.cpp
@@ -17,6 +17,8 @@
#include "llvm/Analysis/AliasAnalysis.h"
#include "llvm/Module.h"
+namespace llvm {
+
namespace {
class DSAA : public Pass, public AliasAnalysis {
TDDataStructures *TD;
@@ -176,3 +178,5 @@
#endif
return getAnalysis<AliasAnalysis>().getMustAliases(P, RetVals);
}
+
+} // End llvm namespace
diff --git a/lib/Analysis/DataStructure/DataStructureOpt.cpp b/lib/Analysis/DataStructure/DataStructureOpt.cpp
index 0ca7d6b..d037b52 100644
--- a/lib/Analysis/DataStructure/DataStructureOpt.cpp
+++ b/lib/Analysis/DataStructure/DataStructureOpt.cpp
@@ -18,6 +18,8 @@
#include "llvm/Constant.h"
#include "Support/Statistic.h"
+namespace llvm {
+
namespace {
Statistic<>
NumGlobalsConstanted("ds-opt", "Number of globals marked constant");
@@ -47,7 +49,6 @@
RegisterOpt<DSOpt> X("ds-opt", "DSA-based simple optimizations");
}
-
/// OptimizeGlobals - This method uses information taken from DSA to optimize
/// global variables.
///
@@ -96,3 +97,5 @@
}
return Changed;
}
+
+} // End llvm namespace
diff --git a/lib/Analysis/DataStructure/DataStructureStats.cpp b/lib/Analysis/DataStructure/DataStructureStats.cpp
index 8d29848..3659c90 100644
--- a/lib/Analysis/DataStructure/DataStructureStats.cpp
+++ b/lib/Analysis/DataStructure/DataStructureStats.cpp
@@ -19,6 +19,8 @@
#include "Support/Statistic.h"
#include <vector>
+namespace llvm {
+
namespace {
Statistic<> TotalNumCallees("totalcallees",
"Total number of callee functions at all indirect call sites");
@@ -139,3 +141,5 @@
visit(F);
return true;
}
+
+} // End llvm namespace
diff --git a/lib/Analysis/DataStructure/GraphChecker.cpp b/lib/Analysis/DataStructure/GraphChecker.cpp
index b0164da..11ebc69 100644
--- a/lib/Analysis/DataStructure/GraphChecker.cpp
+++ b/lib/Analysis/DataStructure/GraphChecker.cpp
@@ -29,6 +29,8 @@
#include "llvm/Value.h"
#include <set>
+namespace llvm {
+
namespace {
enum DSPass { local, bu, td };
cl::opt<DSPass>
@@ -193,3 +195,5 @@
}
}
}
+
+} // End llvm namespace
diff --git a/lib/Analysis/DataStructure/IPModRef.cpp b/lib/Analysis/DataStructure/IPModRef.cpp
index 64b60d4..01b5bd0 100644
--- a/lib/Analysis/DataStructure/IPModRef.cpp
+++ b/lib/Analysis/DataStructure/IPModRef.cpp
@@ -23,6 +23,8 @@
#include "Support/StringExtras.h"
#include <vector>
+namespace llvm {
+
//----------------------------------------------------------------------------
// Private constants and data
//----------------------------------------------------------------------------
@@ -441,3 +443,5 @@
{
print(std::cerr);
}
+
+} // End llvm namespace
diff --git a/lib/Analysis/DataStructure/Local.cpp b/lib/Analysis/DataStructure/Local.cpp
index 0aca21a..253cbf7 100644
--- a/lib/Analysis/DataStructure/Local.cpp
+++ b/lib/Analysis/DataStructure/Local.cpp
@@ -28,6 +28,8 @@
//
#include "llvm/Module.h"
+namespace llvm {
+
static RegisterAnalysis<LocalDataStructures>
X("datastructure", "Local Data Structure Analysis");
@@ -41,8 +43,8 @@
return false;
}
}
-using namespace DS;
+using namespace DS;
namespace {
cl::opt<bool>
@@ -144,6 +146,8 @@
};
}
+using namespace DS;
+
//===----------------------------------------------------------------------===//
// DSGraph constructor - Simply use the GraphBuilder to construct the local
// graph.
@@ -617,3 +621,5 @@
delete GlobalsGraph;
GlobalsGraph = 0;
}
+
+} // End llvm namespace
diff --git a/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp b/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp
index 076836a..e61c076 100644
--- a/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp
+++ b/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp
@@ -31,6 +31,7 @@
#include "Support/hash_map"
#include "Support/hash_set"
+namespace llvm {
///--------------------------------------------------------------------------
/// struct ModRefTable:
@@ -122,7 +123,7 @@
class ModRefInfoBuilder : public InstVisitor<ModRefInfoBuilder> {
const DSGraph& funcGraph;
const FunctionModRefInfo& funcModRef;
- ModRefTable& modRefTable;
+ struct ModRefTable& modRefTable;
ModRefInfoBuilder(); // DO NOT IMPLEMENT
ModRefInfoBuilder(const ModRefInfoBuilder&); // DO NOT IMPLEMENT
@@ -498,3 +499,5 @@
static RegisterAnalysis<MemoryDepAnalysis>
Z("memdep", "Memory Dependence Analysis");
+
+} // End llvm namespace
diff --git a/lib/Analysis/DataStructure/Parallelize.cpp b/lib/Analysis/DataStructure/Parallelize.cpp
index 77e6ed3..fd39b6b 100644
--- a/lib/Analysis/DataStructure/Parallelize.cpp
+++ b/lib/Analysis/DataStructure/Parallelize.cpp
@@ -53,6 +53,8 @@
#include <functional>
#include <algorithm>
+namespace llvm {
+
//----------------------------------------------------------------------------
// Global constants used in marking Cilk functions and function calls.
//----------------------------------------------------------------------------
@@ -535,3 +537,5 @@
return true;
}
+
+} // End llvm namespace
diff --git a/lib/Analysis/DataStructure/PgmDependenceGraph.cpp b/lib/Analysis/DataStructure/PgmDependenceGraph.cpp
index ef44cb3..b861c89 100644
--- a/lib/Analysis/DataStructure/PgmDependenceGraph.cpp
+++ b/lib/Analysis/DataStructure/PgmDependenceGraph.cpp
@@ -30,6 +30,7 @@
#include "llvm/Analysis/PostDominators.h"
#include "llvm/Function.h"
+namespace llvm {
//----------------------------------------------------------------------------
// class DepIterState
@@ -253,3 +254,5 @@
static RegisterAnalysis<PgmDependenceGraph>
Z("pgmdep", "Enumerate Program Dependence Graph (data and control)");
+
+} // End llvm namespace
diff --git a/lib/Analysis/DataStructure/Printer.cpp b/lib/Analysis/DataStructure/Printer.cpp
index 9587979..9902906 100644
--- a/lib/Analysis/DataStructure/Printer.cpp
+++ b/lib/Analysis/DataStructure/Printer.cpp
@@ -23,6 +23,8 @@
#include <fstream>
#include <sstream>
+namespace llvm {
+
// OnlyPrintMain - The DataStructure printer exposes this option to allow
// printing of only the graph for "main".
//
@@ -32,7 +34,6 @@
Statistic<> NumFoldedNodes ("dsnode", "Number of folded nodes (in final graph)");
}
-
void DSNode::dump() const { print(std::cerr, 0); }
static std::string getCaption(const DSNode *N, const DSGraph *G) {
@@ -280,3 +281,5 @@
void TDDataStructures::print(std::ostream &O, const Module *M) const {
printCollection(*this, O, M, "td.");
}
+
+} // End llvm namespace
diff --git a/lib/Analysis/DataStructure/Steensgaard.cpp b/lib/Analysis/DataStructure/Steensgaard.cpp
index 8bf917f..d868d25 100644
--- a/lib/Analysis/DataStructure/Steensgaard.cpp
+++ b/lib/Analysis/DataStructure/Steensgaard.cpp
@@ -20,6 +20,8 @@
#include "llvm/Module.h"
#include "Support/Debug.h"
+namespace llvm {
+
namespace {
class Steens : public Pass, public AliasAnalysis {
DSGraph *ResultGraph;
@@ -76,7 +78,6 @@
RegisterAnalysisGroup<AliasAnalysis, Steens> Y;
}
-
/// ResolveFunctionCall - Resolve the actual arguments of a call to function F
/// with the specified call site descriptor. This function links the arguments
/// and the return value for the call site context-insensitively.
@@ -235,3 +236,5 @@
//
return getAnalysis<AliasAnalysis>().alias(V1, V1Size, V2, V2Size);
}
+
+} // End llvm namespace
diff --git a/lib/Analysis/DataStructure/TopDownClosure.cpp b/lib/Analysis/DataStructure/TopDownClosure.cpp
index ad5a9d72..696368a 100644
--- a/lib/Analysis/DataStructure/TopDownClosure.cpp
+++ b/lib/Analysis/DataStructure/TopDownClosure.cpp
@@ -21,6 +21,8 @@
#include "Support/Debug.h"
#include "Support/Statistic.h"
+namespace llvm {
+
namespace {
RegisterAnalysis<TDDataStructures> // Register the pass
Y("tddatastructure", "Top-down Data Structure Analysis");
@@ -310,3 +312,4 @@
<< Graph.getFunctionCalls().size() << "]\n");
}
+} // End llvm namespace