diff options
author | Anton Korobeynikov <asl@math.spbu.ru> | 2008-09-09 20:05:04 +0000 |
---|---|---|
committer | Anton Korobeynikov <asl@math.spbu.ru> | 2008-09-09 20:05:04 +0000 |
commit | 19e861a4ffb896f16a691d5ac869e894df3cd464 (patch) | |
tree | 70e54c4bb030e963a4d15d45abb8bb48f8447e3f /lib/VMCore | |
parent | 7ca9d81bce9b3ea6ed2f5e7476a6c4d15c882b2a (diff) | |
download | llvm-19e861a4ffb896f16a691d5ac869e894df3cd464.tar.gz llvm-19e861a4ffb896f16a691d5ac869e894df3cd464.tar.bz2 llvm-19e861a4ffb896f16a691d5ac869e894df3cd464.tar.xz |
Make safer variant of alias resolution routine to be default
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@56005 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/VMCore')
-rw-r--r-- | lib/VMCore/Globals.cpp | 6 | ||||
-rw-r--r-- | lib/VMCore/Verifier.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/VMCore/Globals.cpp b/lib/VMCore/Globals.cpp index 7ceda6cd53..c917dfc3be 100644 --- a/lib/VMCore/Globals.cpp +++ b/lib/VMCore/Globals.cpp @@ -248,11 +248,11 @@ const GlobalValue *GlobalAlias::getAliasedGlobal() const { return 0; } -const GlobalValue *GlobalAlias::resolveAliasedGlobal(bool traverseWeak) const { +const GlobalValue *GlobalAlias::resolveAliasedGlobal(bool stopOnWeak) const { SmallPtrSet<const GlobalValue*, 3> Visited; // Check if we need to stop early. - if (!traverseWeak && hasWeakLinkage()) + if (stopOnWeak && hasWeakLinkage()) return this; const GlobalValue *GV = getAliasedGlobal(); @@ -260,7 +260,7 @@ const GlobalValue *GlobalAlias::resolveAliasedGlobal(bool traverseWeak) const { // Iterate over aliasing chain, stopping on weak alias if necessary. while (const GlobalAlias *GA = dyn_cast<GlobalAlias>(GV)) { - if (!traverseWeak && GA->hasWeakLinkage()) + if (stopOnWeak && GA->hasWeakLinkage()) break; GV = GA->getAliasedGlobal(); diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp index af11fce5e7..be053aba94 100644 --- a/lib/VMCore/Verifier.cpp +++ b/lib/VMCore/Verifier.cpp @@ -394,7 +394,7 @@ void Verifier::visitGlobalAlias(GlobalAlias &GA) { &GA); } - const GlobalValue* Aliasee = GA.resolveAliasedGlobal(); + const GlobalValue* Aliasee = GA.resolveAliasedGlobal(/*stopOnWeak*/ false); Assert1(Aliasee, "Aliasing chain should end with function or global variable", &GA); |