aboutsummaryrefslogtreecommitdiff
path: root/lib/Linker
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2011-07-14 20:23:05 +0000
committerChris Lattner <sabre@nondot.org>2011-07-14 20:23:05 +0000
commitf84c59d1100af416a70e475eb25741e27f3bb832 (patch)
treeb115895e3ab3906b880f6e8159369ad78582a360 /lib/Linker
parent0063225bd7fa68e94e99bce2bbacb90341d1e667 (diff)
simplify this logic now that GlobalAlias::isDeclaration is fixed.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@135183 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Linker')
-rw-r--r--lib/Linker/LinkModules.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp
index d77062772e..f566c079e6 100644
--- a/lib/Linker/LinkModules.cpp
+++ b/lib/Linker/LinkModules.cpp
@@ -437,10 +437,8 @@ bool ModuleLinker::getLinkageResult(GlobalValue *Dest, const GlobalValue *Src,
assert(!Src->hasLocalLinkage() &&
"If Src has internal linkage, Dest shouldn't be set!");
- // FIXME: GlobalAlias::isDeclaration is broken, should always be
- // false.
- bool SrcIsDeclaration = Src->isDeclaration() && !isa<GlobalAlias>(Src);
- bool DestIsDeclaration = Dest->isDeclaration() && !isa<GlobalAlias>(Dest);
+ bool SrcIsDeclaration = Src->isDeclaration();
+ bool DestIsDeclaration = Dest->isDeclaration();
if (SrcIsDeclaration) {
// If Src is external or if both Src & Dest are external.. Just link the