maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Do not return null or Undefined from find{All,}ByVersion. 

Vectors returned form that function contained nullptrs or Undefined symbols.
This patch filter them out. This makes use of the function a bit easier.

llvm-svn: 290334
This commit is contained in:
Rui Ueyama 2016-12-22 09:54:32 +00:00
parent 9ff608cdc6
commit 4c134ea3b8
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lld/ELF/SymbolTable.cpp
View File

@ -561,6 +561,8 @@ StringMap<std::vector<SymbolBody *>> &SymbolTable<ELFT>::getDemangledSyms() {
DemangledSyms.emplace(); DemangledSyms.emplace();
for (Symbol *Sym : SymVector) { for (Symbol *Sym : SymVector) {
SymbolBody *B = Sym->body(); SymbolBody *B = Sym->body();
if (B->isUndefined())
continue;
if (Optional<std::string> S = demangle(B->getName())) if (Optional<std::string> S = demangle(B->getName()))
(*DemangledSyms)[*S].push_back(B); (*DemangledSyms)[*S].push_back(B);
else else
@ -574,7 +576,10 @@ template <class ELFT>
std::vector<SymbolBody *> SymbolTable<ELFT>::findByVersion(SymbolVersion Ver) { std::vector<SymbolBody *> SymbolTable<ELFT>::findByVersion(SymbolVersion Ver) {
if (Ver.IsExternCpp) if (Ver.IsExternCpp)
return getDemangledSyms().lookup(Ver.Name); return getDemangledSyms().lookup(Ver.Name);
return {find(Ver.Name)}; if (SymbolBody *B = find(Ver.Name))
if (!B->isUndefined())
return {B};
return {};
} }
template <class ELFT> template <class ELFT>
@ -586,16 +591,13 @@ SymbolTable<ELFT>::findAllByVersion(SymbolVersion Ver) {
if (Ver.IsExternCpp) { if (Ver.IsExternCpp) {
for (auto &P : getDemangledSyms()) for (auto &P : getDemangledSyms())
if (M.match(P.first())) if (M.match(P.first()))
for (SymbolBody *Body : P.second) Res.insert(Res.end(), P.second.begin(), P.second.end());
if (!Body->isUndefined())
Res.push_back(Body);
return Res; return Res;
} }
for (Symbol *Sym : SymVector) { for (Symbol *Sym : SymVector) {
SymbolBody *B = Sym->body(); SymbolBody *B = Sym->body();
StringRef Name = B->getName(); if (!B->isUndefined() && M.match(B->getName()))
if (!B->isUndefined() && M.match(Name))
Res.push_back(B); Res.push_back(B);
} }
return Res; return Res;
@ -614,8 +616,7 @@ template <class ELFT> void SymbolTable<ELFT>::handleAnonymousVersion() {
continue; continue;
} }
for (SymbolBody *B : findByVersion(Ver)) for (SymbolBody *B : findByVersion(Ver))
if (B) B->symbol()->VersionId = VER_NDX_GLOBAL;
B->symbol()->VersionId = VER_NDX_GLOBAL;
} }
} }
@ -629,16 +630,15 @@ void SymbolTable<ELFT>::assignExactVersion(SymbolVersion Ver, uint16_t VersionId
// Get a list of symbols which we need to assign the version to. // Get a list of symbols which we need to assign the version to.
std::vector<SymbolBody *> Syms = findByVersion(Ver); std::vector<SymbolBody *> Syms = findByVersion(Ver);
if (Syms.empty()) {
if (Config->NoUndefinedVersion)
error("version script assignment of '" + VersionName + "' to symbol '" +
Ver.Name + "' failed: symbol not defined");
return;
}
// Assign the version. // Assign the version.
for (SymbolBody *B : Syms) { for (SymbolBody *B : Syms) {
if (!B || B->isUndefined()) {
if (Config->NoUndefinedVersion)
error("version script assignment of '" + VersionName + "' to symbol '" +
Ver.Name + "' failed: symbol not defined");
continue;
}
Symbol *Sym = B->symbol(); Symbol *Sym = B->symbol();
if (Sym->InVersionScript) if (Sym->InVersionScript)
warn("duplicate symbol '" + Ver.Name + "' in version script"); warn("duplicate symbol '" + Ver.Name + "' in version script");