Add support for the new va_arg instruction

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

diff --git a/lib/Transforms/IPO/Internalize.cpp b/lib/Transforms/IPO/Internalize.cpp
index f0b0b1b0b7b5169f9afab181052773312f4bb657..f09fd141c72cbab8a2fd8427d26820c2cdc7ad3a 100644 (file)
--- a/lib/Transforms/IPO/Internalize.cpp
+++ b/lib/Transforms/IPO/Internalize.cpp
@@ -9,33 +9,27 @@
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Pass.h"
 #include "llvm/Module.h"
-#include "Support/StatisticReporter.h"
+#include "Support/Statistic.h"
 
 namespace {
-  Statistic<> NumFunctions("internalize\t- Number of functions internalized");
-  Statistic<> NumGlobals  ("internalize\t- Number of global vars internalized");
-
+  Statistic<> NumFunctions("internalize", "Number of functions internalized");
+  Statistic<> NumGlobals  ("internalize", "Number of global vars internalized");
 
   class InternalizePass : public Pass {
     virtual bool run(Module &M) {
-      bool FoundMain = false;   // Look for a function named main...
-      for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I)
-        if (I->getName() == "main" && !I->isExternal() &&
-            I->hasExternalLinkage()) {
-          FoundMain = true;
-          break;
-        }
-      
-      if (!FoundMain) return false;  // No main found, must be a library...
+      Function *MainFunc = M.getMainFunction();
+
+      if (MainFunc == 0 || MainFunc->isExternal())
+        return false;  // No main found, must be a library...
       
       bool Changed = false;
       
       // Found a main function, mark all functions not named main as internal.
       for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I)
-        if (I->getName() != "main" &&   // Leave the main function external
+        if (&*I != MainFunc &&          // Leave the main function external
             !I->isExternal() &&         // Function must be defined here
             !I->hasInternalLinkage()) { // Can't already have internal linkage
-          I->setInternalLinkage(true);
+          I->setLinkage(GlobalValue::InternalLinkage);
           Changed = true;
           ++NumFunctions;
           DEBUG(std::cerr << "Internalizing func " << I->getName() << "\n");
@@ -43,8 +37,8 @@ namespace {
 
       // Mark all global variables with initializers as internal as well...
       for (Module::giterator I = M.gbegin(), E = M.gend(); I != E; ++I)
-        if (I->hasInitializer() && I->hasExternalLinkage()) {
-          I->setInternalLinkage(true);
+        if (!I->isExternal() && I->hasExternalLinkage()) {
+          I->setLinkage(GlobalValue::InternalLinkage);
           Changed = true;
           ++NumGlobals;
           DEBUG(std::cerr << "Internalizing gvar " << I->getName() << "\n");