Index: lib/ReaderWriter/ELF/ELFLinkingContext.cpp
===================================================================
--- lib/ReaderWriter/ELF/ELFLinkingContext.cpp
+++ lib/ReaderWriter/ELF/ELFLinkingContext.cpp
@@ -232,7 +232,7 @@
 }

 std::string ELFLinkingContext::demangle(StringRef symbolName) const {
-  if (!_demangle)
+  if (!demangleSymbols())
     return symbolName;

   // Only try to demangle symbols that look like C++ symbols
Index: lib/ReaderWriter/MachO/MachOLinkingContext.cpp
===================================================================
--- lib/ReaderWriter/MachO/MachOLinkingContext.cpp
+++ lib/ReaderWriter/MachO/MachOLinkingContext.cpp
@@ -791,7 +791,7 @@

 std::string MachOLinkingContext::demangle(StringRef symbolName) const {
   // Only try to demangle symbols if -demangle on command line
-  if (!_demangle)
+  if (!demangleSymbols())
     return symbolName;

   // Only try to demangle symbols that look like C++ symbols