aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Linker
diff options
context:
space:
mode:
authorPeter Collingbourne <peter@pcc.me.uk>2011-10-30 17:46:34 +0000
committerStephen Hines <srhines@google.com>2011-11-14 09:11:30 -0800
commit20eb19aed8f8802776c98537f6164db97115c707 (patch)
treedf3096ca5c0aa15f3b3a1e267bd9d18652733ce1 /lib/Linker
parente0c4cc4cc79ccba12cdeae80ddc14cdd29de12ba (diff)
downloadexternal_llvm-20eb19aed8f8802776c98537f6164db97115c707.zip
external_llvm-20eb19aed8f8802776c98537f6164db97115c707.tar.gz
external_llvm-20eb19aed8f8802776c98537f6164db97115c707.tar.bz2
Teach ModuleLinker::getLinkageResult about materialisable functions
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@143316 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Linker')
-rw-r--r--lib/Linker/LinkModules.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp
index 03a962e..bcc6782 100644
--- a/lib/Linker/LinkModules.cpp
+++ b/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) {