diff --git a/lld/Common/Strings.cpp b/lld/Common/Strings.cpp
index 4b40abeda5e6..627435f141da 100644
--- a/lld/Common/Strings.cpp
+++ b/lld/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/lld/ELF/SymbolTable.cpp b/lld/ELF/SymbolTable.cpp
index 64dd1621ceaa..8470a077e7f0 100644
--- a/lld/ELF/SymbolTable.cpp
+++ b/lld/ELF/SymbolTable.cpp
@@ -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;
diff --git a/lld/ELF/Symbols.cpp b/lld/ELF/Symbols.cpp
index 3845da799346..e34f47d6830e 100644
--- a/lld/ELF/Symbols.cpp
+++ b/lld/ELF/Symbols.cpp
@@ -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 {
diff --git a/lld/include/lld/Common/Strings.h b/lld/include/lld/Common/Strings.h
index eb9bd43a4783..9d002bf336de 100644
--- a/lld/include/lld/Common/Strings.h
+++ b/lld/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/lld/wasm/Symbols.cpp b/lld/wasm/Symbols.cpp
index c5d9aff3130a..d36e33adf2d0 100644
--- a/lld/wasm/Symbols.cpp
+++ b/lld/wasm/Symbols.cpp
@@ -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;
 }