* We were forgetting to pass varargs arguments through a call

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

diff --git a/lib/Transforms/Scalar/SymbolStripping.cpp b/lib/Transforms/Scalar/SymbolStripping.cpp
index f99684faaf671b549304a2876f58b5a2e8e10407..58395c55ab83b777d962809c2f9856fc821ed864 100644 (file)
--- a/lib/Transforms/Scalar/SymbolStripping.cpp
+++ b/lib/Transforms/Scalar/SymbolStripping.cpp
@@ -1,4 +1,11 @@
 //===- SymbolStripping.cpp - Strip symbols for functions and modules ------===//
+// 
+//                     The LLVM Compiler Infrastructure
+//
+// This file was developed by the LLVM research group and is distributed under
+// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// 
+//===----------------------------------------------------------------------===//
 //
 // This file implements stripping symbols out of symbol tables.
 //
@@ -14,26 +21,24 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Transforms/SymbolStripping.h"
+#include "llvm/Transforms/Scalar.h"
 #include "llvm/Module.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.
+static bool StripSymbolTable(SymbolTable &SymTab) {
   bool RemovedSymbol = false;
 
-  for (SymbolTable::iterator I = SymTab->begin(); I != SymTab->end(); ++I) {
+  for (SymbolTable::iterator I = SymTab.begin(); I != SymTab.end(); ++I) {
     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<Constant>(V) || isa<Type>(V))
-       SymTab->type_remove(B);
+       SymTab.type_remove(B);
       else 
-       V->setName("", SymTab);   // Set name to "", removing from symbol table!
+       V->setName("", &SymTab);  // Set name to "", removing from symbol table!
       RemovedSymbol = true;
       assert(Plane.begin() != B && "Symbol not removed from table!");
     }
@@ -42,38 +47,24 @@ static bool StripSymbolTable(SymbolTable *SymTab) {
   return RemovedSymbol;
 }
 
-
-// DoSymbolStripping - Remove all symbolic information from a function
-//
-static bool doSymbolStripping(Function *F) {
-  return StripSymbolTable(F->getSymbolTable());
-}
-
-// doStripGlobalSymbols - Remove all symbolic information from all functions 
-// in a module, and all module level symbols. (function names, etc...)
-//
-static bool doStripGlobalSymbols(Module *M) {
-  // Remove all symbols from functions in this module... and then strip all of
-  // the symbols in this module...
-  //  
-  return StripSymbolTable(M->getSymbolTable());
-}
-
 namespace {
   struct SymbolStripping : public FunctionPass {
-    virtual bool runOnFunction(Function *F) {
-      return doSymbolStripping(F);
+    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");
 
   struct FullSymbolStripping : public SymbolStripping {
-    virtual bool doInitialization(Module *M) {
-      return doStripGlobalSymbols(M);
+    virtual bool doInitialization(Module &M) {
+      return StripSymbolTable(M.getSymbolTable());
     }
   };
+  RegisterOpt<FullSymbolStripping> Y("mstrip",
+                                     "Strip symbols from module and functions");
 }
 
 Pass *createSymbolStrippingPass() {