[LLD] Simplify the demangleItanium function. NFC.
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
git-svn-id: https://llvm.org/svn/llvm-project/lld/trunk@373077 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Common/Strings.cpp b/Common/Strings.cpp
index 4b40abe..627435f 100644
--- a/Common/Strings.cpp
+++ b/Common/Strings.cpp
@@ -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) {
diff --git a/ELF/SymbolTable.cpp b/ELF/SymbolTable.cpp
index 64dd162..8470a07 100644
--- a/ELF/SymbolTable.cpp
+++ b/ELF/SymbolTable.cpp
@@ -123,10 +123,7 @@
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;
diff --git a/ELF/Symbols.cpp b/ELF/Symbols.cpp
index 3845da7..e34f47d 100644
--- a/ELF/Symbols.cpp
+++ b/ELF/Symbols.cpp
@@ -45,8 +45,7 @@
// 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 {
diff --git a/include/lld/Common/Strings.h b/include/lld/Common/Strings.h
index eb9bd43..9d002bf 100644
--- a/include/lld/Common/Strings.h
+++ b/include/lld/Common/Strings.h
@@ -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);
diff --git a/wasm/Symbols.cpp b/wasm/Symbols.cpp
index c5d9aff..d36e33a 100644
--- a/wasm/Symbols.cpp
+++ b/wasm/Symbols.cpp
@@ -304,8 +304,7 @@
std::string lld::maybeDemangleSymbol(StringRef name) {
if (config->demangle)
- if (Optional<std::string> s = demangleItanium(name))
- return *s;
+ return demangleItanium(name);
return name;
}
