diff options
| author | Anton Korobeynikov <asl@math.spbu.ru> | 2008-09-09 18:23:48 +0000 |
|---|---|---|
| committer | Anton Korobeynikov <asl@math.spbu.ru> | 2008-09-09 18:23:48 +0000 |
| commit | 832b2a9cd8870211bf2d347d7b435beacbb06c8d (patch) | |
| tree | 2c8499487682972aae62e62ecf86c320f70f4045 /lib/Linker | |
| parent | bff66b0c6c8266a6f9ba6c9bd5d2541a4d4c6ec9 (diff) | |
| download | external_llvm-832b2a9cd8870211bf2d347d7b435beacbb06c8d.zip external_llvm-832b2a9cd8870211bf2d347d7b435beacbb06c8d.tar.gz external_llvm-832b2a9cd8870211bf2d347d7b435beacbb06c8d.tar.bz2 | |
Fix incorrect linker behaviour: we shouldn't resolve weak aliases.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@55997 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Linker')
| -rw-r--r-- | lib/Linker/LinkModules.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp index 3b319c2..f4ebe6b 100644 --- a/lib/Linker/LinkModules.cpp +++ b/lib/Linker/LinkModules.cpp @@ -1169,8 +1169,8 @@ static bool LinkAppendingVars(Module *M, static bool ResolveAliases(Module *Dest) { for (Module::alias_iterator I = Dest->alias_begin(), E = Dest->alias_end(); I != E; ++I) - if (const GlobalValue *GV = I->resolveAliasedGlobal()) - if (!GV->isDeclaration()) + if (const GlobalValue *GV = I->resolveAliasedGlobal(/*traverseWeak*/ false)) + if (GV != I && !GV->isDeclaration()) I->replaceAllUsesWith(const_cast<GlobalValue*>(GV)); return false; |