Merge pull request #1512 from Teemperor/cherry/766db6824d6c8f8061c1477be474c955db5296d7

[lldb] Fix that Swift uses the DisplayName in the FormatManager (cherry-pick swift/master-rebranch)

Author: Teemperor

lldb/source/DataFormatters/FormatManager.cpp

@@ -18,6 +18,10 @@
 #include "lldb/Target/Language.h"
 #include "lldb/Utility/Log.h"
 
+// BEGIN SWIFT
+#include "Plugins/TypeSystem/Clang/TypeSystemClang.h"
+// END SWIFT
+
 using namespace lldb;
 using namespace lldb_private;
 using namespace lldb_private::formatters;
@@ -192,14 +196,21 @@ void FormatManager::GetPossibleMatches(
     entries.push_back(
         {type_name, did_strip_ptr, did_strip_ref, did_strip_typedef});
 
-    const SymbolContext *sc = nullptr;
-    if (valobj.GetFrameSP())
-      sc = &valobj.GetFrameSP()->GetSymbolContext(eSymbolContextFunction);
-
-    ConstString display_type_name(compiler_type.GetTypeName());
-    if (display_type_name != type_name)
-      entries.push_back({display_type_name, did_strip_ptr,
-                         did_strip_ref, did_strip_typedef});
+// BEGIN SWIFT
+    TypeSystem *ts = compiler_type.GetTypeSystem();
+    if (ts && !llvm::isa<TypeSystemClang>(ts)) {
+// END SWIFT
+      const SymbolContext *sc = nullptr;
+      if (valobj.GetFrameSP())
+        sc = &valobj.GetFrameSP()->GetSymbolContext(eSymbolContextFunction);
+
+      ConstString display_type_name(compiler_type.GetDisplayTypeName(sc));
+      if (display_type_name != type_name)
+        entries.push_back({display_type_name, reason, did_strip_ptr,
+                           did_strip_ref, did_strip_typedef});
+// BEGIN SWIFT
+    }
+// END SWIFT
   }
 
   for (bool is_rvalue_ref = true, j = true;