revert to using eTypeName

Author: charles-zablit

lldb/source/Core/Mangled.cpp

@@ -352,7 +352,7 @@ ConstString Mangled::GetDemangledNameImpl(bool force, // BEGIN SWIFT
     Log *log = GetLog(LLDBLog::Demangle);
     LLDB_LOGF(log, "demangle swift: %s", mangled_name);
     std::string demangled(SwiftLanguageRuntime::DemangleSymbolAsString(
-        mangled_name, SwiftLanguageRuntime::eSimplified, sc));
+        mangled_name, SwiftLanguageRuntime::eTypeName, sc));
     // Don't cache the demangled name the function isn't available yet.
     if (!sc || !sc->function) {
       LLDB_LOGF(log, "demangle swift: %s -> \"%s\" (not cached)", mangled_name,

lldb/source/Plugins/Language/Swift/SwiftLanguage.cpp

@@ -1721,10 +1721,9 @@ bool SwiftLanguage::GetFunctionDisplayName(
       return false;
     if (sc.function->GetLanguage() != eLanguageTypeSwift)
       return false;
-    std::string display_name =
-        sc.GetPossiblyInlinedFunctionName()
-            .GetName(Mangled::NamePreference::ePreferDemangled)
-            .AsCString();
+    std::string display_name = SwiftLanguageRuntime::DemangleSymbolAsString(
+        sc.GetPossiblyInlinedFunctionName().GetMangledName(),
+        SwiftLanguageRuntime::eSimplified, &sc, exe_ctx);
     if (display_name.empty())
       return false;
     ExecutionContextScope *exe_scope =