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/tools/analyze/AnalysisWrappers.cpp b/tools/analyze/AnalysisWrappers.cpp
index 6c4c99f..a9b9cd0 100644
--- a/tools/analyze/AnalysisWrappers.cpp
+++ b/tools/analyze/AnalysisWrappers.cpp
@@ -26,6 +26,8 @@
#include "llvm/Analysis/LoopInfo.h"
#include "llvm/Support/InstIterator.h"
+using namespace llvm;
+
namespace {
struct InstForestHelper : public FunctionPass {
Function *F;
diff --git a/tools/analyze/GraphPrinters.cpp b/tools/analyze/GraphPrinters.cpp
index 34c937f..6d2750f 100644
--- a/tools/analyze/GraphPrinters.cpp
+++ b/tools/analyze/GraphPrinters.cpp
@@ -20,6 +20,8 @@
#include "llvm/Analysis/CallGraph.h"
#include <fstream>
+namespace llvm {
+
template<typename GraphType>
static void WriteGraphToFile(std::ostream &O, const std::string &GraphName,
const GraphType >) {
@@ -72,3 +74,5 @@
RegisterAnalysis<CallGraphPrinter> P2("print-callgraph",
"Print Call Graph to 'dot' file");
};
+
+} // End llvm namespace
diff --git a/tools/analyze/PrintSCC.cpp b/tools/analyze/PrintSCC.cpp
index 3459381..ce89fff 100644
--- a/tools/analyze/PrintSCC.cpp
+++ b/tools/analyze/PrintSCC.cpp
@@ -31,6 +31,8 @@
#include "llvm/Support/CFG.h"
#include "Support/SCCIterator.h"
+namespace llvm {
+
namespace {
struct CFGSCC : public FunctionPass {
bool runOnFunction(Function& func);
@@ -101,3 +103,5 @@
return true;
}
+
+} // End llvm namespace
diff --git a/tools/analyze/analyze.cpp b/tools/analyze/analyze.cpp
index 836b6aa..3e1e516 100644
--- a/tools/analyze/analyze.cpp
+++ b/tools/analyze/analyze.cpp
@@ -26,6 +26,7 @@
#include "Support/Timer.h"
#include <algorithm>
+using namespace llvm;
struct ModulePassPrinter : public Pass {
const PassInfo *PassToPrint;
diff --git a/tools/bugpoint/BugDriver.cpp b/tools/bugpoint/BugDriver.cpp
index f0fb785..1284358 100644
--- a/tools/bugpoint/BugDriver.cpp
+++ b/tools/bugpoint/BugDriver.cpp
@@ -23,6 +23,8 @@
#include "Support/FileUtilities.h"
#include <memory>
+using namespace llvm;
+
// Anonymous namespace to define command line options for debugging.
//
namespace {
@@ -36,6 +38,8 @@
"(for miscompilation detection)"));
}
+namespace llvm {
+
/// getPassesString - Turn a list of passes into a string which indicates the
/// command line options that must be passed to add the passes.
///
@@ -179,3 +183,5 @@
}
std::cout << std::flush;
}
+
+} // End llvm namespace
diff --git a/tools/bugpoint/BugDriver.h b/tools/bugpoint/BugDriver.h
index e1af721..af04a7d 100644
--- a/tools/bugpoint/BugDriver.h
+++ b/tools/bugpoint/BugDriver.h
@@ -19,6 +19,8 @@
#include <vector>
#include <string>
+namespace llvm {
+
class PassInfo;
class Module;
class Function;
@@ -207,4 +209,6 @@
//
void DeleteFunctionBody(Function *F);
+} // End llvm namespace
+
#endif
diff --git a/tools/bugpoint/CodeGeneratorBug.cpp b/tools/bugpoint/CodeGeneratorBug.cpp
index 41df79a..b24620e 100644
--- a/tools/bugpoint/CodeGeneratorBug.cpp
+++ b/tools/bugpoint/CodeGeneratorBug.cpp
@@ -33,6 +33,8 @@
#include <algorithm>
#include <set>
+namespace llvm {
+
extern cl::list<std::string> InputArgv;
class ReduceMisCodegenFunctions : public ListReducer<Function*> {
@@ -408,3 +410,5 @@
return false;
}
+
+} // End llvm namespace
diff --git a/tools/bugpoint/CrashDebugger.cpp b/tools/bugpoint/CrashDebugger.cpp
index 0b2851f..8c29ea2 100644
--- a/tools/bugpoint/CrashDebugger.cpp
+++ b/tools/bugpoint/CrashDebugger.cpp
@@ -29,6 +29,8 @@
#include <fstream>
#include <set>
+namespace llvm {
+
class DebugCrashes : public ListReducer<const PassInfo*> {
BugDriver &BD;
public:
@@ -397,3 +399,5 @@
return false;
}
+
+} // End llvm namespace
diff --git a/tools/bugpoint/ExecutionDriver.cpp b/tools/bugpoint/ExecutionDriver.cpp
index 596aeb9..9a3bd55 100644
--- a/tools/bugpoint/ExecutionDriver.cpp
+++ b/tools/bugpoint/ExecutionDriver.cpp
@@ -30,6 +30,8 @@
#include <fstream>
#include <iostream>
+using namespace llvm;
+
namespace {
// OutputType - Allow the user to specify the way code should be run, to test
// for miscompilation.
@@ -58,6 +60,8 @@
"into executing programs"));
}
+namespace llvm {
+
// Anything specified after the --args option are taken as arguments to the
// program being debugged.
cl::list<std::string>
@@ -232,3 +236,5 @@
bool BugDriver::isExecutingJIT() {
return InterpreterSel == RunJIT;
}
+
+} // End llvm namespace
diff --git a/tools/bugpoint/ExtractFunction.cpp b/tools/bugpoint/ExtractFunction.cpp
index 38e2586..4c671be 100644
--- a/tools/bugpoint/ExtractFunction.cpp
+++ b/tools/bugpoint/ExtractFunction.cpp
@@ -25,8 +25,15 @@
#include "llvm/Target/TargetData.h"
#include "Support/CommandLine.h"
+
+namespace llvm {
+
bool DisableSimplifyCFG = false;
+} // End llvm namespace
+
+using namespace llvm;
+
namespace {
cl::opt<bool>
NoADCE("disable-adce",
@@ -39,6 +46,8 @@
cl::desc("Do not use the -simplifycfg pass to reduce testcases"));
}
+namespace llvm {
+
/// deleteInstructionFromProgram - This method clones the current Program and
/// deletes the specified instruction from the cloned module. It then runs a
/// series of cleanup passes (ADCE and SimplifyCFG) to eliminate any code which
@@ -125,3 +134,5 @@
}
return M;
}
+
+} // End llvm namespace
diff --git a/tools/bugpoint/ListReducer.h b/tools/bugpoint/ListReducer.h
index 0ab2ef9..0ad2406 100644
--- a/tools/bugpoint/ListReducer.h
+++ b/tools/bugpoint/ListReducer.h
@@ -17,6 +17,8 @@
#include <vector>
+namespace llvm {
+
template<typename ElTy>
struct ListReducer {
enum TestResult {
@@ -109,4 +111,6 @@
}
};
+} // End llvm namespace
+
#endif
diff --git a/tools/bugpoint/Miscompilation.cpp b/tools/bugpoint/Miscompilation.cpp
index 5ec8b15..1fb46a6 100644
--- a/tools/bugpoint/Miscompilation.cpp
+++ b/tools/bugpoint/Miscompilation.cpp
@@ -19,6 +19,8 @@
#include "llvm/Transforms/Utils/Linker.h"
#include "Support/FileUtilities.h"
+namespace llvm {
+
class ReduceMiscompilingPasses : public ListReducer<const PassInfo*> {
BugDriver &BD;
public:
@@ -308,3 +310,5 @@
return false;
}
+
+} // End llvm namespace
diff --git a/tools/bugpoint/OptimizerDriver.cpp b/tools/bugpoint/OptimizerDriver.cpp
index 600a25a..af9d1e5 100644
--- a/tools/bugpoint/OptimizerDriver.cpp
+++ b/tools/bugpoint/OptimizerDriver.cpp
@@ -26,6 +26,8 @@
#include <sys/types.h>
#include <sys/wait.h>
+namespace llvm {
+
/// writeProgramToFile - This writes the current "Program" to the named bytecode
/// file. If an error occurs, true is returned.
///
@@ -159,3 +161,5 @@
// Was the child successful?
return !ExitedOK;
}
+
+} // End llvm namespace
diff --git a/tools/bugpoint/TestPasses.cpp b/tools/bugpoint/TestPasses.cpp
index af5c045..ee2c0d7 100644
--- a/tools/bugpoint/TestPasses.cpp
+++ b/tools/bugpoint/TestPasses.cpp
@@ -18,6 +18,8 @@
#include "llvm/Pass.h"
#include "llvm/Support/InstVisitor.h"
+using namespace llvm;
+
namespace {
/// CrashOnCalls - This pass is used to test bugpoint. It intentionally
/// crashes on any call instructions.
diff --git a/tools/bugpoint/ToolRunner.cpp b/tools/bugpoint/ToolRunner.cpp
index a66b868..50a9ad2 100644
--- a/tools/bugpoint/ToolRunner.cpp
+++ b/tools/bugpoint/ToolRunner.cpp
@@ -18,6 +18,8 @@
#include <iostream>
#include <fstream>
+namespace llvm {
+
//===---------------------------------------------------------------------===//
// LLI Implementation of AbstractIntepreter interface
//
@@ -391,3 +393,5 @@
Message = "Found gcc: " + GCCPath + "\n";
return new GCC(GCCPath);
}
+
+} // End llvm namespace
diff --git a/tools/bugpoint/ToolRunner.h b/tools/bugpoint/ToolRunner.h
index e23ec7f..8ce3f5d 100644
--- a/tools/bugpoint/ToolRunner.h
+++ b/tools/bugpoint/ToolRunner.h
@@ -20,6 +20,8 @@
#include "Support/SystemUtils.h"
#include <vector>
+namespace llvm {
+
class CBE;
class LLC;
@@ -137,4 +139,6 @@
int OutputAsm(const std::string &Bytecode, std::string &OutputAsmFile);
};
+} // End llvm namespace
+
#endif
diff --git a/tools/bugpoint/bugpoint.cpp b/tools/bugpoint/bugpoint.cpp
index 8f55804..9bca7fd 100644
--- a/tools/bugpoint/bugpoint.cpp
+++ b/tools/bugpoint/bugpoint.cpp
@@ -19,6 +19,8 @@
#include "Config/unistd.h"
#include <sys/resource.h>
+using namespace llvm;
+
static cl::list<std::string>
InputFilenames(cl::Positional, cl::OneOrMore,
cl::desc("<input llvm ll/bc files>"));
diff --git a/tools/extract/extract.cpp b/tools/extract/extract.cpp
index 272d473..72412b8 100644
--- a/tools/extract/extract.cpp
+++ b/tools/extract/extract.cpp
@@ -21,6 +21,8 @@
#include "Support/CommandLine.h"
#include <memory>
+using namespace llvm;
+
// InputFilename - The filename to read from.
static cl::opt<std::string>
InputFilename(cl::Positional, cl::desc("<input bytecode file>"),
diff --git a/tools/gccas/gccas.cpp b/tools/gccas/gccas.cpp
index d97c716..c7a2204 100644
--- a/tools/gccas/gccas.cpp
+++ b/tools/gccas/gccas.cpp
@@ -27,6 +27,8 @@
#include <memory>
#include <fstream>
+using namespace llvm;
+
namespace {
cl::opt<std::string>
InputFilename(cl::Positional,cl::desc("<input llvm assembly>"),cl::init("-"));
diff --git a/tools/gccld/GenerateCode.cpp b/tools/gccld/GenerateCode.cpp
index bf32400..aac1f93 100644
--- a/tools/gccld/GenerateCode.cpp
+++ b/tools/gccld/GenerateCode.cpp
@@ -25,11 +25,14 @@
#include "Support/SystemUtils.h"
#include "Support/CommandLine.h"
+using namespace llvm;
+
namespace {
cl::opt<bool>
DisableInline("disable-inlining", cl::desc("Do not run the inliner pass"));
}
+namespace llvm {
/// GenerateBytecode - generates a bytecode file from the specified module.
///
@@ -221,3 +224,5 @@
// Run the compiler to assembly and link together the program.
return ExecWait(&(cmd[0]), clean_env);
}
+
+} // End llvm namespace
diff --git a/tools/gccld/Linker.cpp b/tools/gccld/Linker.cpp
index 06f0635..9c22891 100644
--- a/tools/gccld/Linker.cpp
+++ b/tools/gccld/Linker.cpp
@@ -30,6 +30,8 @@
#include <memory>
#include <set>
+namespace llvm {
+
/// FindLib - Try to convert Filename into the name of a file that we can open,
/// if it does not already name a file we can open, by first trying to open
/// Filename, then libFilename.<suffix> for each of a set of several common
@@ -405,3 +407,5 @@
return false;
}
+
+} // End llvm namespace
diff --git a/tools/gccld/gccld.cpp b/tools/gccld/gccld.cpp
index 45163f4..5a1b261 100644
--- a/tools/gccld/gccld.cpp
+++ b/tools/gccld/gccld.cpp
@@ -36,6 +36,8 @@
#include <fstream>
#include <memory>
+using namespace llvm;
+
namespace {
cl::list<std::string>
InputFilenames(cl::Positional, cl::desc("<input bytecode files>"),
@@ -86,6 +88,8 @@
CO5("eh-frame-hdr", cl::Hidden, cl::desc("Compatibility option: ignored"));
}
+namespace llvm {
+
//
// Function: PrintAndReturn ()
//
@@ -211,6 +215,7 @@
return;
}
+} // End llvm namespace
int main(int argc, char **argv, char **envp) {
cl::ParseCommandLineOptions(argc, argv, " llvm linker for GCC\n");
diff --git a/tools/gccld/gccld.h b/tools/gccld/gccld.h
index e3c5504..9b7eb1e 100644
--- a/tools/gccld/gccld.h
+++ b/tools/gccld/gccld.h
@@ -17,6 +17,8 @@
#include <set>
#include <ostream>
+namespace llvm {
+
int
PrintAndReturn (const char *progname,
const std::string &Message,
@@ -69,3 +71,4 @@
const std::vector<std::string> & Files,
bool Verbose);
+} // End llvm namespace
diff --git a/tools/llc/llc.cpp b/tools/llc/llc.cpp
index 0143d08..f219b6e 100644
--- a/tools/llc/llc.cpp
+++ b/tools/llc/llc.cpp
@@ -23,6 +23,8 @@
#include <memory>
#include <fstream>
+using namespace llvm;
+
// General options for llc. Other pass-specific options are specified
// within the corresponding llc passes, and target-specific options
// and back-end code generation options are specified with the target machine.
diff --git a/tools/lli/lli.cpp b/tools/lli/lli.cpp
index 87fe461..82b354d 100644
--- a/tools/lli/lli.cpp
+++ b/tools/lli/lli.cpp
@@ -28,6 +28,8 @@
#include "Support/Debug.h"
#include "Support/SystemUtils.h"
+using namespace llvm;
+
namespace {
cl::opt<std::string>
InputFile(cl::desc("<input bytecode>"), cl::Positional, cl::init("-"));
diff --git a/tools/llvm-ar/llvm-ar.cpp b/tools/llvm-ar/llvm-ar.cpp
index 879d847..e9a4dbf 100644
--- a/tools/llvm-ar/llvm-ar.cpp
+++ b/tools/llvm-ar/llvm-ar.cpp
@@ -25,6 +25,8 @@
#include <unistd.h>
#include <sys/mman.h>
+using namespace llvm;
+
using std::string;
using std::vector;
using std::cout;
@@ -69,7 +71,7 @@
//Option to generate symbol table or not
//running llvm-ar -s is the same as ranlib
-cl::opt<bool> SymbolTable ("s", cl::desc("Generate an archive symbol table"));
+cl::opt<bool> SymbolTableOption ("s", cl::desc("Generate an archive symbol table"));
//Archive name
cl::opt<string> Archive (cl::Positional, cl::desc("<archive file>"),
@@ -335,7 +337,7 @@
ArchiveFile << ARMAG;
//If the '-s' option was specified, generate symbol table.
- if(SymbolTable) {
+ if(SymbolTableOption) {
cout << "Symbol Table Start: " << ArchiveFile.tellp() << "\n";
if(!WriteSymbolTable(ArchiveFile)) {
std::cerr << "Error creating symbol table. Exiting program.";
diff --git a/tools/llvm-as/llvm-as.cpp b/tools/llvm-as/llvm-as.cpp
index 0905466..9be5aff 100644
--- a/tools/llvm-as/llvm-as.cpp
+++ b/tools/llvm-as/llvm-as.cpp
@@ -24,6 +24,8 @@
#include <fstream>
#include <memory>
+using namespace llvm;
+
static cl::opt<std::string>
InputFilename(cl::Positional, cl::desc("<input .llvm file>"), cl::init("-"));
diff --git a/tools/llvm-dis/llvm-dis.cpp b/tools/llvm-dis/llvm-dis.cpp
index 9157559..8d0ca7b 100644
--- a/tools/llvm-dis/llvm-dis.cpp
+++ b/tools/llvm-dis/llvm-dis.cpp
@@ -29,10 +29,12 @@
// OutputMode - The different orderings to print basic blocks in...
enum OutputMode {
- llvm = 0, // Generate LLVM assembly (the default)
+ LLVM = 0, // Generate LLVM assembly (the default)
c, // Generate C code
};
+using namespace llvm;
+
static cl::opt<std::string>
InputFilename(cl::Positional, cl::desc("<input bytecode>"), cl::init("-"));
@@ -45,8 +47,8 @@
static cl::opt<enum OutputMode>
WriteMode(cl::desc("Specify the output format:"),
- cl::values(clEnumVal(llvm, "Output LLVM assembly"),
- clEnumVal(c , "Output C code for program"),
+ cl::values(clEnumVal(LLVM, "Output LLVM assembly"),
+ clEnumVal(c, "Output C code for program"),
0));
int main(int argc, char **argv) {
@@ -116,7 +118,7 @@
PassManager Passes;
switch (WriteMode) {
- case llvm: // Output LLVM assembly
+ case LLVM: // Output LLVM assembly
Passes.add(new PrintModulePass(Out));
break;
case c: // Convert LLVM to C
diff --git a/tools/llvm-extract/llvm-extract.cpp b/tools/llvm-extract/llvm-extract.cpp
index 272d473..72412b8 100644
--- a/tools/llvm-extract/llvm-extract.cpp
+++ b/tools/llvm-extract/llvm-extract.cpp
@@ -21,6 +21,8 @@
#include "Support/CommandLine.h"
#include <memory>
+using namespace llvm;
+
// InputFilename - The filename to read from.
static cl::opt<std::string>
InputFilename(cl::Positional, cl::desc("<input bytecode file>"),
diff --git a/tools/llvm-link/llvm-link.cpp b/tools/llvm-link/llvm-link.cpp
index 764b59b..3b49214 100644
--- a/tools/llvm-link/llvm-link.cpp
+++ b/tools/llvm-link/llvm-link.cpp
@@ -24,6 +24,8 @@
#include <sys/types.h> // For FileExists
#include <sys/stat.h>
+using namespace llvm;
+
static cl::list<std::string>
InputFilenames(cl::Positional, cl::OneOrMore,
cl::desc("<input bytecode files>"));
diff --git a/tools/llvm-nm/llvm-nm.cpp b/tools/llvm-nm/llvm-nm.cpp
index f7a0ef6..878aa24 100644
--- a/tools/llvm-nm/llvm-nm.cpp
+++ b/tools/llvm-nm/llvm-nm.cpp
@@ -21,6 +21,8 @@
#include "Support/CommandLine.h"
#include <cctype>
+using namespace llvm;
+
namespace {
enum OutputFormatTy { bsd, sysv, posix };
cl::opt<OutputFormatTy>
diff --git a/tools/llvm-prof/ProfileInfo.cpp b/tools/llvm-prof/ProfileInfo.cpp
index 78de9c1..1d37c42 100644
--- a/tools/llvm-prof/ProfileInfo.cpp
+++ b/tools/llvm-prof/ProfileInfo.cpp
@@ -20,6 +20,8 @@
#include <fcntl.h>
#include <stdio.h>
+using namespace llvm;
+
enum ProfilingType {
ArgumentInfo = 1, // The command line argument block
FunctionInfo = 2, // Function profiling information
diff --git a/tools/llvm-prof/ProfileInfo.h b/tools/llvm-prof/ProfileInfo.h
index 24e4296..db45001 100644
--- a/tools/llvm-prof/ProfileInfo.h
+++ b/tools/llvm-prof/ProfileInfo.h
@@ -18,6 +18,9 @@
#include <vector>
#include <string>
#include <utility>
+
+namespace llvm {
+
class Module;
class Function;
class BasicBlock;
@@ -55,4 +58,6 @@
void getBlockCounts(std::vector<std::pair<BasicBlock*, unsigned> > &Counts);
};
+} // End llvm namespace
+
#endif
diff --git a/tools/llvm-prof/llvm-prof.cpp b/tools/llvm-prof/llvm-prof.cpp
index 4492fd6..438fecf 100644
--- a/tools/llvm-prof/llvm-prof.cpp
+++ b/tools/llvm-prof/llvm-prof.cpp
@@ -23,6 +23,8 @@
#include <map>
#include <set>
+using namespace llvm;
+
namespace {
cl::opt<std::string>
BytecodeFile(cl::Positional, cl::desc("<program bytecode file>"),
diff --git a/tools/opt/AnalysisWrappers.cpp b/tools/opt/AnalysisWrappers.cpp
index 6c4c99f..a9b9cd0 100644
--- a/tools/opt/AnalysisWrappers.cpp
+++ b/tools/opt/AnalysisWrappers.cpp
@@ -26,6 +26,8 @@
#include "llvm/Analysis/LoopInfo.h"
#include "llvm/Support/InstIterator.h"
+using namespace llvm;
+
namespace {
struct InstForestHelper : public FunctionPass {
Function *F;
diff --git a/tools/opt/GraphPrinters.cpp b/tools/opt/GraphPrinters.cpp
index 34c937f..6d2750f 100644
--- a/tools/opt/GraphPrinters.cpp
+++ b/tools/opt/GraphPrinters.cpp
@@ -20,6 +20,8 @@
#include "llvm/Analysis/CallGraph.h"
#include <fstream>
+namespace llvm {
+
template<typename GraphType>
static void WriteGraphToFile(std::ostream &O, const std::string &GraphName,
const GraphType >) {
@@ -72,3 +74,5 @@
RegisterAnalysis<CallGraphPrinter> P2("print-callgraph",
"Print Call Graph to 'dot' file");
};
+
+} // End llvm namespace
diff --git a/tools/opt/PrintSCC.cpp b/tools/opt/PrintSCC.cpp
index 3459381..ce89fff 100644
--- a/tools/opt/PrintSCC.cpp
+++ b/tools/opt/PrintSCC.cpp
@@ -31,6 +31,8 @@
#include "llvm/Support/CFG.h"
#include "Support/SCCIterator.h"
+namespace llvm {
+
namespace {
struct CFGSCC : public FunctionPass {
bool runOnFunction(Function& func);
@@ -101,3 +103,5 @@
return true;
}
+
+} // End llvm namespace
diff --git a/tools/opt/opt.cpp b/tools/opt/opt.cpp
index bc0a5fc..30c72f1 100644
--- a/tools/opt/opt.cpp
+++ b/tools/opt/opt.cpp
@@ -27,6 +27,7 @@
#include <memory>
#include <algorithm>
+using namespace llvm;
// The OptimizationList is automatically populated with registered Passes by the
// PassNameParser.