diff options
author | Eli Friedman <eli.friedman@gmail.com> | 2012-01-11 22:06:46 +0000 |
---|---|---|
committer | Eli Friedman <eli.friedman@gmail.com> | 2012-01-11 22:06:46 +0000 |
commit | e15f421a9acd18ca71fed382ac09f7367b6a72f6 (patch) | |
tree | 6bbac9b50843befb9b7cdbdfcc19227bc73fd173 /include/llvm | |
parent | 4992881636697d3f323c06724984996f715c98ad (diff) | |
download | external_llvm-e15f421a9acd18ca71fed382ac09f7367b6a72f6.zip external_llvm-e15f421a9acd18ca71fed382ac09f7367b6a72f6.tar.gz external_llvm-e15f421a9acd18ca71fed382ac09f7367b6a72f6.tar.bz2 |
Re-fix the issue Bill fixed in r147899 in a slightly different way, which doesn't abuse the semantics of linker_private. We don't really want to merge any string constant with a weak_odr global.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@147971 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/llvm')
-rw-r--r-- | include/llvm/GlobalValue.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/llvm/GlobalValue.h b/include/llvm/GlobalValue.h index d43a2fa..81a11a4 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); |