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 | 702d1cd358e2bb7cfdca2a2795706d18d881e275 (patch) | |
| tree | ae0b0de9241dce7db1adb70995d37184728b4677 /lib | |
| parent | 82a21e4cfbf0eb3eea040ae355bee12cd6ed45ed (diff) | |
| download | external_llvm-702d1cd358e2bb7cfdca2a2795706d18d881e275.zip external_llvm-702d1cd358e2bb7cfdca2a2795706d18d881e275.tar.gz external_llvm-702d1cd358e2bb7cfdca2a2795706d18d881e275.tar.bz2 | |
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')
| -rw-r--r-- | lib/Linker/LinkModules.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp index e07629f..6f26e95 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. |