Move stuff out of the Optimizations directories into the appropriate Transforms

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

diff --git a/lib/Transforms/Scalar/SymbolStripping.cpp b/lib/Transforms/Scalar/SymbolStripping.cpp
index bafcee6be7c505d9617e9bc0537ab1f418acd63a..12f8e918b3f142d3cda946eb4128456340dfa190 100644 (file)
--- a/lib/Transforms/Scalar/SymbolStripping.cpp
+++ b/lib/Transforms/Scalar/SymbolStripping.cpp
@@ -14,7 +14,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Optimizations/AllOpts.h"
+#include "llvm/Transforms/SymbolStripping.h"
 #include "llvm/Module.h"
 #include "llvm/Method.h"
 #include "llvm/SymbolTable.h"
@@ -24,13 +24,17 @@ static bool StripSymbolTable(SymbolTable *SymTab) {
   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;
     
-    map<const string, Value *>::iterator B;
+    SymbolTable::type_iterator B;
     while ((B = Plane.begin()) != Plane.end()) {   // Found nonempty type plane!
-      B->second->setName("");     // Set name to "", removing from symbol table!
+      Value *V = B->second;
+      if (isa<Constant>(V) || isa<Type>(V))
+       SymTab->type_remove(B);
+      else 
+       V->setName("", SymTab);   // Set name to "", removing from symbol table!
       RemovedSymbol = true;
-      assert(Plane.begin() != B);
+      assert(Plane.begin() != B && "Symbol not removed from table!");
     }
   }
  
@@ -40,16 +44,16 @@ static bool StripSymbolTable(SymbolTable *SymTab) {
 
 // DoSymbolStripping - Remove all symbolic information from a method
 //
-bool opt::DoSymbolStripping(Method *M) {
+bool SymbolStripping::doSymbolStripping(Method *M) {
   return StripSymbolTable(M->getSymbolTable());
 }
 
-// DoFullSymbolStripping - Remove all symbolic information from all methods 
+// doStripGlobalSymbols - Remove all symbolic information from all methods 
 // in a module, and all module level symbols. (method names, etc...)
 //
-bool opt::DoFullSymbolStripping(Module *M) {
+bool FullSymbolStripping::doStripGlobalSymbols(Module *M) {
   // Remove all symbols from methods in this module... and then strip all of the
   // symbols in this module...
   //  
-  return DoSymbolStripping(M) | StripSymbolTable(M->getSymbolTable());
+  return StripSymbolTable(M->getSymbolTable());
 }