Merge "vndk-vtable-dumper: Use demangled name of symbol while handling symbol aliasing." into pi-dev

am: 1c0887bc0d

Change-Id: I6ac0ac0c3195dd77ea3aefbacdaebf99ccc44352
This commit is contained in:
Jayant Chowdhary
2018-05-23 10:43:56 -07:00
committed by android-build-merger

View File

@@ -329,8 +329,9 @@ SymbolRef ELFSharedObject<ELFT>::matchValueToSymbol(
const std::string ClassName(Vtablep->getDemangledName().substr(pos));
for (const SymbolRef &Symbol : SymVec) {
StringRef SymbolName = UnWrap(Symbol.getName());
if (SymbolName.str().find(ClassName) != std::string::npos)
if (demangle(SymbolName.str()).find(ClassName) != std::string::npos) {
return Symbol;
}
}
// Return the 1st Symbol by default.
return SymVec[0];