X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=blobdiff_plain;f=lib%2FTransforms%2FIPO%2FGlobalDCE.cpp;h=cdad155a0b3f3b9deec13a97d717589ab4a2f6ff;hp=7e7a4c0ae8354c69cae1470acbb266681f2b4dc3;hb=5b55a47e94e28fbb56d0cd5d72c3db9105c15b4c;hpb=c8a1169c935ad9d3dfbdd4f72d80abf8f5acb03c

diff --git a/lib/Transforms/IPO/GlobalDCE.cpp b/lib/Transforms/IPO/GlobalDCE.cpp
index 7e7a4c0ae83..cdad155a0b3 100644
--- a/lib/Transforms/IPO/GlobalDCE.cpp
+++ b/lib/Transforms/IPO/GlobalDCE.cpp
@@ -44,14 +44,19 @@ namespace {
     bool runOnModule(Module &M) override;
 
   private:
-    SmallPtrSet<GlobalValue*, 32> AliveGlobals;
+    SmallPtrSet<Constant *, 32> AliveGlobals;
     SmallPtrSet<Constant *, 8> SeenConstants;
+    SmallPtrSet<GlobalVariable *, 8> DiscardableGlobalInitializers;
 
     /// GlobalIsNeeded - mark the specific global value as needed, and
     /// recursively mark anything that it uses as also needed.
     void GlobalIsNeeded(GlobalValue *GV);
     void MarkUsedGlobalsAsNeeded(Constant *C);
 
+    /// \brief Checks if C is alive or is a ConstantExpr that refers to an alive
+    /// value.
+    bool ContainsUsedGlobal(Constant *C);
+
     bool RemoveUnusedGlobalValue(GlobalValue &GV);
   };
 }
@@ -162,6 +167,19 @@ bool GlobalDCE::runOnModule(Module &M) {
       I->setAliasee(nullptr);
     }
 
+  // Look for available externally constants that we can turn into normal
+  // externals by deleting their initalizers. This allows us to remove other
+  // globals that are referenced by the initializer.
+  if (!DiscardableGlobalInitializers.empty()) {
+    for (GlobalVariable *GV : DiscardableGlobalInitializers) {
+      if (!ContainsUsedGlobal(GV->getInitializer())) {
+        GV->setInitializer(nullptr);
+        GV->setLinkage(GlobalValue::ExternalLinkage);
+        Changed = true;
+      }
+    }
+  }
+
   if (!DeadFunctions.empty()) {
     // Now that all interferences have been dropped, delete the actual objects
     // themselves.
@@ -209,8 +227,12 @@ void GlobalDCE::GlobalIsNeeded(GlobalValue *G) {
   if (GlobalVariable *GV = dyn_cast<GlobalVariable>(G)) {
     // If this is a global variable, we must make sure to add any global values
     // referenced by the initializer to the alive set.
-    if (GV->hasInitializer())
-      MarkUsedGlobalsAsNeeded(GV->getInitializer());
+    if (GV->hasInitializer()) {
+      if (GV->hasAvailableExternallyLinkage())
+        DiscardableGlobalInitializers.insert(GV);
+      else
+        MarkUsedGlobalsAsNeeded(GV->getInitializer());
+    }
   } else if (GlobalAlias *GA = dyn_cast<GlobalAlias>(G)) {
     // The target of a global alias is needed.
     MarkUsedGlobalsAsNeeded(GA->getAliasee());
@@ -248,6 +270,21 @@ void GlobalDCE::MarkUsedGlobalsAsNeeded(Constant *C) {
   }
 }
 
+bool GlobalDCE::ContainsUsedGlobal(Constant *C) {
+  // C contains a used global If C is alive or we visited it while marking
+  // values alive.
+  if (AliveGlobals.count(C) || SeenConstants.count(C))
+    return true;
+
+  // Now check all operands of a ConstantExpr.
+  for (User::op_iterator I = C->op_begin(), E = C->op_end(); I != E; ++I) {
+    Constant *Op = dyn_cast<Constant>(*I);
+    if (Op && ContainsUsedGlobal(Op))
+      return true;
+  }
+  return false;
+}
+
 // RemoveUnusedGlobalValue - Loop over all of the uses of the specified
 // GlobalValue, looking for the constant pointer ref that may be pointing to it.
 // If found, check to see if the constant pointer ref is safe to destroy, and if