aboutsummaryrefslogtreecommitdiff
path: root/llvm/lib
diff options
context:
space:
mode:
authorMichael Spang <spang@google.com>2020-01-28 12:43:07 -0800
committerEli Friedman <efriedma@quicinc.com>2020-01-28 13:26:18 -0800
commita2fb2c0ddca14c133f24d08af4a78b6a3d612ec6 (patch)
tree30efb972b126dd365dd12df902df758a213f719e /llvm/lib
parenteaabaf7e04fe98990a8177a3e053346395efde1c (diff)
downloadllvm-a2fb2c0ddca14c133f24d08af4a78b6a3d612ec6.zip
llvm-a2fb2c0ddca14c133f24d08af4a78b6a3d612ec6.tar.gz
llvm-a2fb2c0ddca14c133f24d08af4a78b6a3d612ec6.tar.bz2
[GlobalMerge] Preserve symbol visibility when merging globals
Symbols created for merged external global variables have default visibility. This can break programs when compiling with -Oz -fvisibility=hidden as symbols that should be hidden will be exported at link time. Differential Revision: https://reviews.llvm.org/D73235
Diffstat (limited to 'llvm/lib')
-rw-r--r--llvm/lib/CodeGen/GlobalMerge.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/llvm/lib/CodeGen/GlobalMerge.cpp b/llvm/lib/CodeGen/GlobalMerge.cpp
index 5870e20..6e5593a 100644
--- a/llvm/lib/CodeGen/GlobalMerge.cpp
+++ b/llvm/lib/CodeGen/GlobalMerge.cpp
@@ -524,6 +524,7 @@ bool GlobalMerge::doMerge(const SmallVectorImpl<GlobalVariable *> &Globals,
for (ssize_t k = i, idx = 0; k != j; k = GlobalSet.find_next(k), ++idx) {
GlobalValue::LinkageTypes Linkage = Globals[k]->getLinkage();
std::string Name = Globals[k]->getName();
+ GlobalValue::VisibilityTypes Visibility = Globals[k]->getVisibility();
GlobalValue::DLLStorageClassTypes DLLStorage =
Globals[k]->getDLLStorageClass();
@@ -549,6 +550,7 @@ bool GlobalMerge::doMerge(const SmallVectorImpl<GlobalVariable *> &Globals,
if (Linkage != GlobalValue::InternalLinkage || !IsMachO) {
GlobalAlias *GA = GlobalAlias::create(Tys[StructIdxs[idx]], AddrSpace,
Linkage, Name, GEP, &M);
+ GA->setVisibility(Visibility);
GA->setDLLStorageClass(DLLStorage);
}