Don't increment invalid iterator.

[oota-llvm.git] / lib / Transforms / IPO / Internalize.cpp

diff --git a/lib/Transforms/IPO/Internalize.cpp b/lib/Transforms/IPO/Internalize.cpp
index 46d80e592ffb76f7b5e3c4c8afeac1a5d54275d2..7ca6cb1dfa9467b6a5138b49a467ce10abc4d381 100644 (file)
--- a/lib/Transforms/IPO/Internalize.cpp
+++ b/lib/Transforms/IPO/Internalize.cpp
@@ -46,16 +46,18 @@ namespace {
     std::set<std::string> ExternalNames;
     bool DontInternalize;
   public:
-    InternalizePass(bool InternalizeEverything = true);
-    InternalizePass(const std::vector <const char *>& exportList);
+    static char ID; // Pass identification, replacement for typeid
+    explicit InternalizePass(bool InternalizeEverything = true);
+    explicit InternalizePass(const std::vector <const char *>& exportList);
     void LoadFile(const char *Filename);
     virtual bool runOnModule(Module &M);
   };
+  char InternalizePass::ID = 0;
   RegisterPass<InternalizePass> X("internalize", "Internalize Global Symbols");
 } // end anonymous namespace
 
 InternalizePass::InternalizePass(bool InternalizeEverything) 
-  : DontInternalize(false){
+  : ModulePass((intptr_t)&ID), DontInternalize(false){
   if (!APIFile.empty())           // If a filename is specified, use it
     LoadFile(APIFile.c_str());
   else if (!APIList.empty())      // Else, if a list is specified, use it.
@@ -66,7 +68,7 @@ InternalizePass::InternalizePass(bool InternalizeEverything)
 }
 
 InternalizePass::InternalizePass(const std::vector<const char *>&exportList) 
-  : DontInternalize(false){
+  : ModulePass((intptr_t)&ID), DontInternalize(false){
   for(std::vector<const char *>::const_iterator itr = exportList.begin();
         itr != exportList.end(); itr++) {
     ExternalNames.insert(*itr);
@@ -126,29 +128,14 @@ bool InternalizePass::runOnModule(Module &M) {
   ExternalNames.insert("llvm.dbg.compile_units");
   ExternalNames.insert("llvm.dbg.global_variables");
   ExternalNames.insert("llvm.dbg.subprograms");
+  ExternalNames.insert("llvm.global_ctors");
+  ExternalNames.insert("llvm.global_dtors");
       
   // Mark all global variables with initializers as internal as well.
   for (Module::global_iterator I = M.global_begin(), E = M.global_end();
        I != E; ++I)
     if (!I->isDeclaration() && !I->hasInternalLinkage() &&
         !ExternalNames.count(I->getName())) {
-      // Special case handling of the global ctor and dtor list.  When we
-      // internalize it, we mark it constant, which allows elimination of
-      // the list if it's empty.
-      //
-      if (I->hasAppendingLinkage() && (I->getName() == "llvm.global_ctors" ||
-                                       I->getName() == "llvm.global_dtors")) {
-        // If the global ctors/dtors list has no uses, do not internalize it, as
-        // there is no __main in this program, so the asmprinter should handle
-        // it.
-        if (I->use_empty()) continue;
- 
-        // Otherwise, also mark the list constant, as we know that it will not
-        // be mutated any longer, and the makes simple IPO xforms automatically
-        // better.
-        I->setConstant(true);
-      }
-      
       I->setLinkage(GlobalValue::InternalLinkage);
       Changed = true;
       ++NumGlobals;