X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2Fllvm-extract%2Fllvm-extract.cpp;h=f3d165bf2fb15c31624dcf51406239a9ae74ea5e;hb=0b1cda19558a12b4f22842083f8cc2de7a3e4f21;hp=a78d1fd9b994dcec878d5959f8087ad7a7a68aab;hpb=6a1359229df442842e9015dc6387a9114df83b4a;p=oota-llvm.git

diff --git a/tools/llvm-extract/llvm-extract.cpp b/tools/llvm-extract/llvm-extract.cpp
index a78d1fd9b99..f3d165bf2fb 100644
--- a/tools/llvm-extract/llvm-extract.cpp
+++ b/tools/llvm-extract/llvm-extract.cpp
@@ -10,85 +10,35 @@
 #include "llvm/PassManager.h"
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/Bytecode/WriteBytecodePass.h"
-#include "llvm/GlobalVariable.h"
-#include "llvm/Function.h"
-#include "llvm/Transforms/IPO/GlobalDCE.h"
-#include "llvm/Transforms/ConstantMerge.h"
-#include "llvm/Transforms/CleanupGCCOutput.h"
+#include "llvm/Transforms/IPO.h"
 #include "Support/CommandLine.h"
 #include <memory>
 
-static cl::String InputFilename("", "Specify input bytecode file", 0, "-");
-static cl::String ExtractFunc("func", "Specify function to extract", 0, "main");
-
-struct FunctionExtractorPass : public Pass {
-  const char *getPassName() const { return "Function Extractor"; }
-
-  bool run(Module *M) {
-    // Mark all global variables to be internal
-    for (Module::giterator I = M->gbegin(), E = M->gend(); I != E; ++I)
-      (*I)->setInternalLinkage(true);
-
-    Function *Named = 0;
-
-    // Loop over all of the functions in the module, dropping all references in
-    // functions that are not the named function.
-    for (Module::iterator I = M->begin(), E = M->end(); I != E;)
-      // Check to see if this is the named function!
-      if (!Named && (*I)->getName() == ExtractFunc) {
-        // Yes, it is.  Keep track of it...
-        Named = *I;
-
-        // Make sure it's globally accessable...
-        Named->setInternalLinkage(false);
-
-        // Remove the named function from the module.
-        M->getFunctionList().remove(I);
-        E = M->end();
-      } else {
-        // Nope it's not the named function, delete the body of the function
-        (*I)->dropAllReferences();
-        ++I;
-      }
-
-    // All of the functions that still have uses now must be used by global
-    // variables or the named function.  Loop through them and create a new,
-    // external function for the used ones... making all uses point to the new
-    // functions.
-    std::vector<Function*> NewFunctions;
-    
-    for (Module::iterator I = M->begin(), E = M->end(); I != E; ++I)
-      if (!(*I)->use_empty()) {
-        Function *New = new Function((*I)->getFunctionType(), false,
-                                     (*I)->getName());
-        (*I)->replaceAllUsesWith(New);
-        NewFunctions.push_back(New);
-      }
-    
-    // Now the module only has unused functions with their references dropped.
-    // Delete them all now!
-    M->getFunctionList().delete_all();
-
-    // Re-insert the named function...
-    if (Named)
-      M->getFunctionList().push_back(Named);
-    else
-      std::cerr << "Warning: Function '" << ExtractFunc << "' not found!\n";
-    
-    // Insert all of the function stubs...
-    M->getFunctionList().insert(M->end(), NewFunctions.begin(),
-                                NewFunctions.end());
-    return true;
-  }
-};
+// InputFilename - The filename to read from.
+static cl::opt<std::string>
+InputFilename(cl::Positional, cl::desc("<input bytecode file>"),
+              cl::init("-"), cl::value_desc("filename"));
+              
 
+// ExtractFunc - The function to extract from the module... defaults to main.
+static cl::opt<std::string>
+ExtractFunc("func", cl::desc("Specify function to extract"), cl::init("main"),
+            cl::value_desc("function"));
 
 int main(int argc, char **argv) {
   cl::ParseCommandLineOptions(argc, argv, " llvm extractor\n");
 
   std::auto_ptr<Module> M(ParseBytecodeFile(InputFilename));
   if (M.get() == 0) {
-    std::cerr << "bytecode didn't read correctly.\n";
+    std::cerr << argv[0] << ": bytecode didn't read correctly.\n";
+    return 1;
+  }
+
+  // Figure out which function we should extract
+  Function *F = M.get()->getNamedFunction(ExtractFunc);
+  if (F == 0) {
+    std::cerr << argv[0] << ": program doesn't contain function named '"
+              << ExtractFunc << "'!\n";
     return 1;
   }
 
@@ -96,12 +46,12 @@ int main(int argc, char **argv) {
   // a little bit.  Do this now.
   //
   PassManager Passes;
-  Passes.add(new FunctionExtractorPass());
+  Passes.add(createFunctionExtractionPass(F));    // Extract the function
   Passes.add(createGlobalDCEPass());              // Delete unreachable globals
-  Passes.add(createConstantMergePass());          // Merge dup global constants
-  Passes.add(createCleanupGCCOutputPass());       // Fix gccisms
+  Passes.add(createFunctionResolvingPass());      // Delete prototypes
+  Passes.add(createDeadTypeEliminationPass());    // Remove dead types...
   Passes.add(new WriteBytecodePass(&std::cout));  // Write bytecode to file...
 
-  Passes.run(M.get());
+  Passes.run(*M.get());
   return 0;
 }