diff options
| -rw-r--r-- | include/llvm/GlobalValue.h | 6 | ||||
| -rw-r--r-- | lib/Transforms/IPO/GlobalOpt.cpp | 11 | ||||
| -rw-r--r-- | test/Transforms/GlobalOpt/hidden.ll | 14 |
3 files changed, 31 insertions, 0 deletions
diff --git a/include/llvm/GlobalValue.h b/include/llvm/GlobalValue.h index 8b969f3354..3b83b5a05c 100644 --- a/include/llvm/GlobalValue.h +++ b/include/llvm/GlobalValue.h @@ -122,6 +122,9 @@ public: static bool isAvailableExternallyLinkage(LinkageTypes Linkage) { return Linkage == AvailableExternallyLinkage; } + static bool isLinkOnceODRLinkage(LinkageTypes Linkage) { + return Linkage == LinkOnceODRLinkage; + } static bool isLinkOnceLinkage(LinkageTypes Linkage) { return Linkage == LinkOnceAnyLinkage || Linkage == LinkOnceODRLinkage; } @@ -202,6 +205,9 @@ public: bool hasAvailableExternallyLinkage() const { return isAvailableExternallyLinkage(Linkage); } + bool hasLinkOnceODRLinkage() const { + return isLinkOnceODRLinkage(Linkage); + } bool hasLinkOnceLinkage() const { return isLinkOnceLinkage(Linkage); } diff --git a/lib/Transforms/IPO/GlobalOpt.cpp b/lib/Transforms/IPO/GlobalOpt.cpp index 35f98b2265..2f1af187f9 100644 --- a/lib/Transforms/IPO/GlobalOpt.cpp +++ b/lib/Transforms/IPO/GlobalOpt.cpp @@ -1731,6 +1731,12 @@ bool GlobalOpt::ProcessGlobal(GlobalVariable *GV, return true; } + if (GV->hasLinkOnceODRLinkage() && GV->hasUnnamedAddr() && GV->isConstant() && + GV->getVisibility() != GlobalValue::HiddenVisibility) { + GV->setVisibility(GlobalValue::HiddenVisibility); + return true; + } + if (!GV->hasLocalLinkage()) return false; @@ -1743,6 +1749,7 @@ bool GlobalOpt::ProcessGlobal(GlobalVariable *GV, if (!GS.isCompared && !GV->hasUnnamedAddr()) { GV->setUnnamedAddr(true); NumUnnamed++; + return true; } if (GV->isConstant() || !GV->hasInitializer()) @@ -1917,6 +1924,10 @@ bool GlobalOpt::OptimizeFunctions(Module &M) { F->eraseFromParent(); Changed = true; ++NumFnDeleted; + } else if (F->hasLinkOnceODRLinkage() && F->hasUnnamedAddr() && + F->getVisibility() != GlobalValue::HiddenVisibility) { + F->setVisibility(GlobalValue::HiddenVisibility); + Changed = true; } else if (F->hasLocalLinkage()) { if (F->getCallingConv() == CallingConv::C && !F->isVarArg() && !F->hasAddressTaken()) { diff --git a/test/Transforms/GlobalOpt/hidden.ll b/test/Transforms/GlobalOpt/hidden.ll new file mode 100644 index 0000000000..301e158d53 --- /dev/null +++ b/test/Transforms/GlobalOpt/hidden.ll @@ -0,0 +1,14 @@ +; RUN: opt %s -globalopt -S | FileCheck %s + +@foo = linkonce_odr unnamed_addr constant i32 42 +; CHECK: @foo = linkonce_odr hidden unnamed_addr constant i32 42 + +define linkonce_odr void @bar() unnamed_addr { +; CHECK: define linkonce_odr hidden void @bar() unnamed_addr { + ret void +} + +define i32* @zed() { + call void @bar() + ret i32* @foo +} |