* Clean up code a little bit

[oota-llvm.git] / lib / Transforms / Scalar / SymbolStripping.cpp

diff --git a/lib/Transforms/Scalar/SymbolStripping.cpp b/lib/Transforms/Scalar/SymbolStripping.cpp
index 06cf025221d0abaadf23c9497cfb93029869b47e..2f3d1aad6a8a70959301a375fd6a922bd92e9022 100644 (file)
--- a/lib/Transforms/Scalar/SymbolStripping.cpp
+++ b/lib/Transforms/Scalar/SymbolStripping.cpp
@@ -1,11 +1,11 @@
-//===- SymbolStripping.cpp - Code to string symbols for methods and modules -=//
+//===- SymbolStripping.cpp - Strip symbols for functions and modules ------===//
 //
 // This file implements stripping symbols out of symbol tables.
 //
 // Specifically, this allows you to strip all of the symbols out of:
-//   * A method
-//   * All methods in a module
-//   * All symbols in a module (all method symbols + all module scope symbols)
+//   * A function
+//   * All functions in a module
+//   * All symbols in a module (all function symbols + all module scope symbols)
 //
 // Notice that:
 //   * This pass makes code much less readable, so it should only be used in
@@ -14,22 +14,23 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Optimizations/AllOpts.h"
+#include "llvm/Transforms/Scalar.h"
 #include "llvm/Module.h"
-#include "llvm/Method.h"
+#include "llvm/Function.h"
 #include "llvm/SymbolTable.h"
+#include "llvm/Pass.h"
 
 static bool StripSymbolTable(SymbolTable *SymTab) {
   if (SymTab == 0) return false;    // No symbol table?  No problem.
   bool RemovedSymbol = false;
 
   for (SymbolTable::iterator I = SymTab->begin(); I != SymTab->end(); ++I) {
-    map<const string, Value *> &Plane = I->second;
+    std::map<const std::string, Value *> &Plane = I->second;
     
     SymbolTable::type_iterator B;
     while ((B = Plane.begin()) != Plane.end()) {   // Found nonempty type plane!
       Value *V = B->second;
-      if (isa<ConstPoolVal>(V) || isa<Type>(V))
+      if (isa<Constant>(V) || isa<Type>(V))
        SymTab->type_remove(B);
       else 
        V->setName("", SymTab);   // Set name to "", removing from symbol table!
@@ -41,19 +42,30 @@ static bool StripSymbolTable(SymbolTable *SymTab) {
   return RemovedSymbol;
 }
 
+namespace {
+  struct SymbolStripping : public FunctionPass {
+    virtual bool runOnFunction(Function &F) {
+      return StripSymbolTable(F.getSymbolTable());
+    }
+    virtual void getAnalysisUsage(AnalysisUsage &AU) const {
+      AU.setPreservesAll();
+    }
+  };
+  RegisterOpt<SymbolStripping> X("strip", "Strip symbols from functions");
 
-// DoSymbolStripping - Remove all symbolic information from a method
-//
-bool opt::SymbolStripping::doSymbolStripping(Method *M) {
-  return StripSymbolTable(M->getSymbolTable());
+  struct FullSymbolStripping : public SymbolStripping {
+    virtual bool doInitialization(Module &M) {
+      return StripSymbolTable(M.getSymbolTable());
+    }
+  };
+  RegisterOpt<FullSymbolStripping> Y("mstrip",
+                                     "Strip symbols from module and functions");
 }
 
-// doStripGlobalSymbols - Remove all symbolic information from all methods 
-// in a module, and all module level symbols. (method names, etc...)
-//
-bool opt::FullSymbolStripping::doStripGlobalSymbols(Module *M) {
-  // Remove all symbols from methods in this module... and then strip all of the
-  // symbols in this module...
-  //  
-  return StripSymbolTable(M->getSymbolTable());
+Pass *createSymbolStrippingPass() {
+  return new SymbolStripping();
+}
+
+Pass *createFullSymbolStrippingPass() {
+  return new FullSymbolStripping();
 }