aboutsummaryrefslogtreecommitdiff
path: root/lib/Linker/LinkModules.cpp
diff options
context:
space:
mode:
authorAnton Korobeynikov <asl@math.spbu.ru>2008-03-10 22:35:31 +0000
committerAnton Korobeynikov <asl@math.spbu.ru>2008-03-10 22:35:31 +0000
commitaeb09967fdb2ff074c91ce8039ebd1917a2f6060 (patch)
treeae0b0de9241dce7db1adb70995d37184728b4677 /lib/Linker/LinkModules.cpp
parent1438b9dd82887b8faa2c4670dca45965609a43c6 (diff)
Always run 'make check' :) Fix fallout from prev. commit: query for possible
alias destination only if we don't have anything to link to git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@48181 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Linker/LinkModules.cpp')
-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 e07629f51b..6f26e95892 100644
--- a/lib/Linker/LinkModules.cpp
+++ b/lib/Linker/LinkModules.cpp
@@ -474,7 +474,7 @@ static bool LinkGlobals(Module *Dest, const Module *Src,
}
// Check to see if may have to link the global with the alias
- if (SGV->hasName() && !SGV->hasInternalLinkage()) {
+ if (!DGV && SGV->hasName() && !SGV->hasInternalLinkage()) {
DGV = Dest->getNamedAlias(SGV->getName());
if (DGV && DGV->getType() != SGV->getType())
// If types don't agree due to opaque types, try to resolve them.