Revert r159136 due to PR13124.

Original commit message:

If a constant or a function has linkonce_odr linkage and unnamed_addr, mark it
hidden. Being linkonce_odr guarantees that it is available in every dso that
needs it. Being a constant/function with unnamed_addr guarantees that the
copies don't have to be merged.

llvm-svn: 159272
This commit is contained in:
Matt Beaumont-Gay 2012-06-27 17:10:33 +00:00
parent 1669f70273
commit a58862310c
3 changed files with 0 additions and 31 deletions

View File

@ -122,9 +122,6 @@ 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;
}
@ -205,9 +202,6 @@ public:
bool hasAvailableExternallyLinkage() const {
return isAvailableExternallyLinkage(Linkage);
}
bool hasLinkOnceODRLinkage() const {
return isLinkOnceODRLinkage(Linkage);
}
bool hasLinkOnceLinkage() const {
return isLinkOnceLinkage(Linkage);
}

View File

@ -1731,12 +1731,6 @@ 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;
@ -1749,7 +1743,6 @@ bool GlobalOpt::ProcessGlobal(GlobalVariable *GV,
if (!GS.isCompared && !GV->hasUnnamedAddr()) {
GV->setUnnamedAddr(true);
NumUnnamed++;
return true;
}
if (GV->isConstant() || !GV->hasInitializer())
@ -1924,10 +1917,6 @@ 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()) {

View File

@ -1,14 +0,0 @@
; 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
}