add a pass that can extract all kinds of global values, not just functions. Update llvm-extract to use it and optionally extract a global variable if you want it too
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@48015 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/llvm-extract/llvm-extract.cpp b/tools/llvm-extract/llvm-extract.cpp
index 67f686e..7a16acf 100644
--- a/tools/llvm-extract/llvm-extract.cpp
+++ b/tools/llvm-extract/llvm-extract.cpp
@@ -39,17 +39,22 @@
Force("f", cl::desc("Overwrite output files"));
static cl::opt<bool>
-DeleteFn("delete", cl::desc("Delete specified function from Module"));
+DeleteFn("delete", cl::desc("Delete specified Globals from Module"));
static cl::opt<bool>
Relink("relink",
cl::desc("Turn external linkage for callees of function to delete"));
-// ExtractFunc - The function to extract from the module... defaults to main.
+// ExtractFunc - The function to extract from the module...
static cl::opt<std::string>
-ExtractFunc("func", cl::desc("Specify function to extract"), cl::init("main"),
+ExtractFunc("func", cl::desc("Specify function to extract"), cl::init(""),
cl::value_desc("function"));
+// ExtractGlobal - The global to extract from the module...
+static cl::opt<std::string>
+ExtractGlobal("glob", cl::desc("Specify global to extract"), cl::init(""),
+ cl::value_desc("global"));
+
int main(int argc, char **argv) {
llvm_shutdown_obj X; // Call llvm_shutdown() on exit.
cl::ParseCommandLineOptions(argc, argv, "llvm extractor\n");
@@ -72,10 +77,17 @@
}
// Figure out which function we should extract
- Function *F = M.get()->getFunction(ExtractFunc);
- if (F == 0) {
+ GlobalVariable *G = ExtractGlobal.size() ?
+ M.get()->getNamedGlobal(ExtractGlobal) : 0;
+
+ // Figure out which function we should extract
+ Function *F = ExtractFunc.size() ?
+ M.get()->getFunction(ExtractFunc) :
+ M.get()->getFunction("main");
+
+ if (F == 0 && G == 0) {
cerr << argv[0] << ": program doesn't contain function named '"
- << ExtractFunc << "'!\n";
+ << ExtractFunc << "' or a global named '" << ExtractGlobal << "'!\n";
return 1;
}
@@ -84,7 +96,11 @@
PassManager Passes;
Passes.add(new TargetData(M.get())); // Use correct TargetData
// Either isolate the function or delete it from the Module
- Passes.add(createFunctionExtractionPass(F, DeleteFn, Relink));
+ std::vector<GlobalValue*> GVs;
+ if (F) GVs.push_back(F);
+ if (G) GVs.push_back(G);
+
+ Passes.add(createGVExtractionPass(GVs, DeleteFn, Relink));
if (!DeleteFn)
Passes.add(createGlobalDCEPass()); // Delete unreachable globals
Passes.add(createDeadTypeEliminationPass()); // Remove dead types...
