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/VMCore | |
| parent | bff66b0c6c8266a6f9ba6c9bd5d2541a4d4c6ec9 (diff) | |
| download | llvm-832b2a9cd8870211bf2d347d7b435beacbb06c8d.tar.gz llvm-832b2a9cd8870211bf2d347d7b435beacbb06c8d.tar.bz2 llvm-832b2a9cd8870211bf2d347d7b435beacbb06c8d.tar.xz | |
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/VMCore')
| -rw-r--r-- | lib/VMCore/Globals.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/VMCore/Globals.cpp b/lib/VMCore/Globals.cpp index 7340f1532f..e55cb5a5ac 100644 --- a/lib/VMCore/Globals.cpp +++ b/lib/VMCore/Globals.cpp @@ -248,13 +248,21 @@ const GlobalValue *GlobalAlias::getAliasedGlobal() const { return 0; } -const GlobalValue *GlobalAlias::resolveAliasedGlobal() const { +const GlobalValue *GlobalAlias::resolveAliasedGlobal(bool traverseWeak) const { SmallPtrSet<const GlobalValue*, 3> Visited; + // Check if we need to stop early. + if (!traverseWeak && hasWeakLinkage()) + return this; + const GlobalValue *GV = getAliasedGlobal(); Visited.insert(GV); + // Iterate over aliasing chain, stopping on weak alias if necessary. while (const GlobalAlias *GA = dyn_cast<GlobalAlias>(GV)) { + if (traverseWeak && GA->hasWeakLinkage()) + break; + GV = GA->getAliasedGlobal(); if (!Visited.insert(GV)) |