summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Linker/LinkModules.cpp
diff options
context:
space:
mode:
authorPeter Collingbourne <peter@pcc.me.uk>2011-10-30 17:46:34 +0000
committerPeter Collingbourne <peter@pcc.me.uk>2011-10-30 17:46:34 +0000
commit8bb15d82769d30873cdb80bdb7234df82d6ba1b6 (patch)
tree6c81d96dc60f71237a5cab5bc7c7b0eeeeac81e0 /llvm/lib/Linker/LinkModules.cpp
parent7402ee6ec2eba44e2f0090e955186cd9ff69dcac (diff)
downloadbcm5719-llvm-8bb15d82769d30873cdb80bdb7234df82d6ba1b6.tar.gz
bcm5719-llvm-8bb15d82769d30873cdb80bdb7234df82d6ba1b6.zip
Teach ModuleLinker::getLinkageResult about materialisable functions
llvm-svn: 143316
Diffstat (limited to 'llvm/lib/Linker/LinkModules.cpp')
-rw-r--r--llvm/lib/Linker/LinkModules.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Linker/LinkModules.cpp b/llvm/lib/Linker/LinkModules.cpp
index 03a962e3be5..bcc6782129c 100644
--- a/llvm/lib/Linker/LinkModules.cpp
+++ b/llvm/lib/Linker/LinkModules.cpp
@@ -446,7 +446,7 @@ bool ModuleLinker::getLinkageResult(GlobalValue *Dest, const GlobalValue *Src,
assert(!Src->hasLocalLinkage() &&
"If Src has internal linkage, Dest shouldn't be set!");
- bool SrcIsDeclaration = Src->isDeclaration();
+ bool SrcIsDeclaration = Src->isDeclaration() && !Src->isMaterializable();
bool DestIsDeclaration = Dest->isDeclaration();
if (SrcIsDeclaration) {
OpenPOWER on IntegriCloud