LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jayant Chowdhary
2018-05-23 16:29:10 +00:00
committed by Android (Google) Code Review
parent 066563adf6 f0641b065f
commit 1c0887bc0d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vndk/tools/vtable-dumper/elf_handling.cpp
View File

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