diff options
| -rw-r--r-- | include/llvm/GlobalValue.h | 10 | ||||
| -rw-r--r-- | lib/Transforms/IPO/ConstantMerge.cpp | 12 |
2 files changed, 7 insertions, 15 deletions
diff --git a/include/llvm/GlobalValue.h b/include/llvm/GlobalValue.h index d43a2fa227..81a11a4c92 100644 --- a/include/llvm/GlobalValue.h +++ b/include/llvm/GlobalValue.h @@ -192,14 +192,6 @@ public: Linkage == LinkerPrivateWeakDefAutoLinkage; } - /// mayBeRemovedByLinker - Whether the definition of this global may be - /// removed at link time. - static bool mayBeRemovedByLinker(LinkageTypes Linkage) { - return isLinkerPrivateLinkage(Linkage) || - isLinkerPrivateWeakLinkage(Linkage) || - isLinkerPrivateWeakDefAutoLinkage(Linkage); - } - bool hasExternalLinkage() const { return isExternalLinkage(Linkage); } bool hasAvailableExternallyLinkage() const { return isAvailableExternallyLinkage(Linkage); @@ -233,8 +225,6 @@ public: bool isWeakForLinker() const { return isWeakForLinker(Linkage); } - bool mayBeRemovedByLinker() const { return mayBeRemovedByLinker(Linkage); } - /// copyAttributesFrom - copy all additional attributes (those not needed to /// create a GlobalValue) from the GlobalValue Src to this one. virtual void copyAttributesFrom(const GlobalValue *Src); diff --git a/lib/Transforms/IPO/ConstantMerge.cpp b/lib/Transforms/IPO/ConstantMerge.cpp index 268a281aae..d8fae8a4b2 100644 --- a/lib/Transforms/IPO/ConstantMerge.cpp +++ b/lib/Transforms/IPO/ConstantMerge.cpp @@ -140,8 +140,11 @@ bool ConstantMerge::runOnModule(Module &M) { UsedGlobals.count(GV)) continue; - // Ignore any constants which may be removed by the linker. - if (GV->mayBeRemovedByLinker()) + // This transformation is legal for weak ODR globals in the sense it + // doesn't change semantics, but we really don't want to perform it + // anyway; it's likely to pessimize code generation, and some tools + // (like the Darwin linker in cases involving CFString) don't expect it. + if (GV->isWeakForLinker()) continue; Constant *Init = GV->getInitializer(); @@ -172,9 +175,8 @@ bool ConstantMerge::runOnModule(Module &M) { UsedGlobals.count(GV)) continue; - // We can only replace constants with local linkage and which aren't - // removed by the linker. - if (!GV->hasLocalLinkage() || GV->mayBeRemovedByLinker()) + // We can only replace constant with local linkage. + if (!GV->hasLocalLinkage()) continue; Constant *Init = GV->getInitializer(); |