diff options
author | Rui Ueyama <ruiu@google.com> | 2016-12-10 00:34:06 +0000 |
---|---|---|
committer | Rui Ueyama <ruiu@google.com> | 2016-12-10 00:34:06 +0000 |
commit | 86581e496b07cd975b8df2e59734b1d5341f0fa3 (patch) | |
tree | 800e132e08db01ac79c4cc53e2c881addd349095 | |
parent | f0c862594b77b131dab77d7b8edcc86ab23660dc (diff) | |
download | bcm5719-llvm-86581e496b07cd975b8df2e59734b1d5341f0fa3.tar.gz bcm5719-llvm-86581e496b07cd975b8df2e59734b1d5341f0fa3.zip |
Rename find(SymbolVersion) to avoid overloading with find(StringRef).
llvm-svn: 289293
-rw-r--r-- | lld/ELF/SymbolTable.cpp | 13 | ||||
-rw-r--r-- | lld/ELF/SymbolTable.h | 4 |
2 files changed, 9 insertions, 8 deletions
diff --git a/lld/ELF/SymbolTable.cpp b/lld/ELF/SymbolTable.cpp index 89275001989..2d7273583c6 100644 --- a/lld/ELF/SymbolTable.cpp +++ b/lld/ELF/SymbolTable.cpp @@ -569,7 +569,7 @@ void SymbolTable<ELFT>::initDemangledSyms() { } template <class ELFT> -std::vector<SymbolBody *> SymbolTable<ELFT>::find(SymbolVersion Ver) { +std::vector<SymbolBody *> SymbolTable<ELFT>::findByVersion(SymbolVersion Ver) { if (Ver.IsExternCpp) { initDemangledSyms(); auto I = DemangledSyms->find(Ver.Name); @@ -583,7 +583,8 @@ std::vector<SymbolBody *> SymbolTable<ELFT>::find(SymbolVersion Ver) { } template <class ELFT> -std::vector<SymbolBody *> SymbolTable<ELFT>::findAll(SymbolVersion Ver) { +std::vector<SymbolBody *> +SymbolTable<ELFT>::findAllByVersion(SymbolVersion Ver) { std::vector<SymbolBody *> Res; StringMatcher M({Ver.Name}); @@ -614,11 +615,11 @@ std::vector<SymbolBody *> SymbolTable<ELFT>::findAll(SymbolVersion Ver) { template <class ELFT> void SymbolTable<ELFT>::handleAnonymousVersion() { for (SymbolVersion &Ver : Config->VersionScriptGlobals) { if (Ver.HasWildcard) { - for (SymbolBody *B : findAll(Ver)) + for (SymbolBody *B : findAllByVersion(Ver)) B->symbol()->VersionId = VER_NDX_GLOBAL; continue; } - for (SymbolBody *B : find(Ver)) + for (SymbolBody *B : findByVersion(Ver)) if (B) B->symbol()->VersionId = VER_NDX_GLOBAL; } @@ -633,7 +634,7 @@ void SymbolTable<ELFT>::assignExactVersion(SymbolVersion Ver, uint16_t VersionId return; // Get a list of symbols which we need to assign the version to. - std::vector<SymbolBody *> Syms = find(Ver); + std::vector<SymbolBody *> Syms = findByVersion(Ver); // Assign the version. for (SymbolBody *B : Syms) { @@ -657,7 +658,7 @@ void SymbolTable<ELFT>::assignWildcardVersion(SymbolVersion Ver, uint16_t VersionId) { if (!Ver.HasWildcard) return; - std::vector<SymbolBody *> Syms = findAll(Ver); + std::vector<SymbolBody *> Syms = findAllByVersion(Ver); // Exact matching takes precendence over fuzzy matching, // so we set a version to a symbol only if no version has been assigned diff --git a/lld/ELF/SymbolTable.h b/lld/ELF/SymbolTable.h index cd9bef30bbd..0c4b42dbc48 100644 --- a/lld/ELF/SymbolTable.h +++ b/lld/ELF/SymbolTable.h @@ -96,8 +96,8 @@ private: uint8_t Visibility, bool CanOmitFromDynSym, InputFile *File); - std::vector<SymbolBody *> find(SymbolVersion Ver); - std::vector<SymbolBody *> findAll(SymbolVersion Ver); + std::vector<SymbolBody *> findByVersion(SymbolVersion Ver); + std::vector<SymbolBody *> findAllByVersion(SymbolVersion Ver); void initDemangledSyms(); void handleAnonymousVersion(); |