in addition to merging, constantmerge should also delete trivially dead globals,
in order to clean up after simplifylibcalls.
llvm-svn: 35982
diff --git a/llvm/lib/Transforms/IPO/ConstantMerge.cpp b/llvm/lib/Transforms/IPO/ConstantMerge.cpp
index 11ec09a..fc142e1 100644
--- a/llvm/lib/Transforms/IPO/ConstantMerge.cpp
+++ b/llvm/lib/Transforms/IPO/ConstantMerge.cpp
@@ -61,7 +61,13 @@
// invalidating the Constant* pointers in CMap.
//
for (Module::global_iterator GV = M.global_begin(), E = M.global_end();
- GV != E; ++GV)
+ GV != E; ++GV) {
+ // If this GV is dead, remove it.
+ GV->removeDeadConstantUsers();
+ if (GV->use_empty() && GV->hasInternalLinkage()) {
+ (GV++)->eraseFromParent();
+ }
+
// Only process constants with initializers.
if (GV->isConstant() && GV->hasInitializer()) {
Constant *Init = GV->getInitializer();
@@ -80,6 +86,7 @@
Slot = GV;
}
}
+ }
if (Replacements.empty())
return MadeChange;