diff options
| author | Anton Korobeynikov <asl@math.spbu.ru> | 2008-03-10 22:35:31 +0000 |
|---|---|---|
| committer | Anton Korobeynikov <asl@math.spbu.ru> | 2008-03-10 22:35:31 +0000 |
| commit | 715ef43c2ee8cca27c717bdf7b113ed5d30e7584 (patch) | |
| tree | 70a65cbbc9a1fa219d87757ac3418b8b50837e21 /llvm | |
| parent | eeb5ca6f5f4388c6ffb53f5e1123fb1e5432d49a (diff) | |
| download | bcm5719-llvm-715ef43c2ee8cca27c717bdf7b113ed5d30e7584.tar.gz bcm5719-llvm-715ef43c2ee8cca27c717bdf7b113ed5d30e7584.zip | |
Always run 'make check' :) Fix fallout from prev. commit: query for possible
alias destination only if we don't have anything to link to
llvm-svn: 48181
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Linker/LinkModules.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Linker/LinkModules.cpp b/llvm/lib/Linker/LinkModules.cpp index e07629f51be..6f26e95892a 100644 --- a/llvm/lib/Linker/LinkModules.cpp +++ b/llvm/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. |
