Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-03-01 14:58:18 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[LLD] Simplify the demangleItanium function. NFC.

Browse Source 
Instead of returning an optional, just return the input string if
demangling fails, as that's what all callers use anyway.

Differential Revision: https://reviews.llvm.org/D68015

llvm-svn: 373077
This commit is contained in:
Martin Storsjo 2019-09-27 12:24:18 +00:00
parent dd71b2d4c3
commit 5ebab1f8f9
5 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lld/Common/Strings.cpp
View File

@ -18,20 +18,17 @@
using namespace llvm;
using namespace lld;
// Returns the demangled C++ symbol name for Name.
Optional<std::string> lld::demangleItanium(StringRef name) {
// Returns the demangled C++ symbol name for name.
std::string lld::demangleItanium(StringRef name) {
// itaniumDemangle can be used to demangle strings other than symbol
// names which do not necessarily start with "_Z". Name can be
// either a C or C++ symbol. Don't call demangle if the name
// does not look like a C++ symbol name to avoid getting unexpected
// result for a C symbol that happens to match a mangled type name.
if (!name.startswith("_Z"))
return None;
return name;
std::string demangled = demangle(name);
if (demangled == name)
return None;
return demangled;
return demangle(name);
}
StringMatcher::StringMatcher(ArrayRef<StringRef> pat) {

5
lld/ELF/SymbolTable.cpp
View File

@ -123,10 +123,7 @@ StringMap<std::vector<Symbol *>> &SymbolTable::getDemangledSyms() {
for (Symbol *sym : symVector) {
if (!sym->isDefined() && !sym->isCommon())
continue;
if (Optional<std::string> s = demangleItanium(sym->getName()))
(*demangledSyms)[*s].push_back(sym);
else
(*demangledSyms)[sym->getName()].push_back(sym);
(*demangledSyms)[demangleItanium(sym->getName())].push_back(sym);
}
}
return *demangledSyms;

3
lld/ELF/Symbols.cpp
View File

@ -45,8 +45,7 @@ Defined *ElfSym::tlsModuleBase;
// Returns a symbol for an error message.
static std::string demangle(StringRef symName) {
if (config->demangle)
if (Optional<std::string> s = demangleItanium(symName))
return *s;
return demangleItanium(symName);
return symName;
}
namespace lld {

4
lld/include/lld/Common/Strings.h
View File

@ -18,8 +18,8 @@
namespace lld {
// Returns a demangled C++ symbol name. If Name is not a mangled
// name, it returns Optional::None.
llvm::Optional<std::string> demangleItanium(llvm::StringRef name);
// name, it returns name.
std::string demangleItanium(llvm::StringRef name);
std::vector<uint8_t> parseHex(llvm::StringRef s);
bool isValidCIdentifier(llvm::StringRef s);

3
lld/wasm/Symbols.cpp
View File

@ -304,8 +304,7 @@ std::string lld::toString(const wasm::Symbol &sym) {
std::string lld::maybeDemangleSymbol(StringRef name) {
if (config->demangle)
if (Optional<std::string> s = demangleItanium(name))
return *s;
return demangleItanium(name);
return name;
}