[lldb] Desugar unlimited levels when calculating type name

Author: augusto2112

lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp

@@ -5569,7 +5569,7 @@ ConstString SwiftASTContext::GetTypeName(opaque_compiler_type_t type) {
   swift::Type swift_type(GetSwiftType(type));
 
   swift::Type normalized_type =
-      swift_type.transform([](swift::Type type) -> swift::Type {
+      swift_type.transformRec([](swift::Type type) -> swift::Type {
         if (swift::SyntaxSugarType *syntax_sugar_type =
                 swift::dyn_cast<swift::SyntaxSugarType>(type.getPointer())) {
           return syntax_sugar_type->getSinglyDesugaredType();

lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.cpp

@@ -905,7 +905,7 @@ TypeSystemSwiftTypeRef::GetSwiftified(swift::Demangle::Demangler &dem,
 
 swift::Demangle::NodePointer TypeSystemSwiftTypeRef::GetNodeForPrintingImpl(
     swift::Demangle::Demangler &dem, swift::Demangle::NodePointer node,
-    bool resolve_objc_module, bool desugar) {
+    bool resolve_objc_module) {
   using namespace swift::Demangle;
   return Transform(dem, node, [&](NodePointer node) {
     NodePointer canonical = node;
@@ -957,26 +957,19 @@ swift::Demangle::NodePointer TypeSystemSwiftTypeRef::GetNodeForPrintingImpl(
     }
 
     case Node::Kind::SugaredOptional:
-      // This is particularly silly. The outermost sugared Optional is
-      // desugared. See SwiftASTContext::GetTypeName() and remove it there, too!
-      if (desugar && node->getNumChildren() == 1) {
-        desugar = false;
+      if (node->getNumChildren() == 1) {
         return Desugar(dem, node, Node::Kind::BoundGenericEnum,
                        Node::Kind::Enum, "Optional");
       }
       return node;
     case Node::Kind::SugaredArray:
-      // See comment on SugaredOptional.
-      if (desugar && node->getNumChildren() == 1) {
-        desugar = false;
+      if (node->getNumChildren() == 1) {
         return Desugar(dem, node, Node::Kind::BoundGenericStructure,
                        Node::Kind::Structure, "Array");
       }
       return node;
     case Node::Kind::SugaredDictionary:
-      // See comment on SugaredOptional.
-      if (desugar && node->getNumChildren() == 1) {
-        desugar = false;
+      if (node->getNumChildren() == 1) {
         return Desugar(dem, node, Node::Kind::BoundGenericStructure,
                        Node::Kind::Structure, "Dictionary");
       }

lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.h

@@ -331,7 +331,7 @@ class TypeSystemSwiftTypeRef : public TypeSystemSwift {
   swift::Demangle::NodePointer
   GetNodeForPrintingImpl(swift::Demangle::Demangler &dem,
                          swift::Demangle::NodePointer node,
-                         bool resolve_objc_module, bool desugar = true);
+                         bool resolve_objc_module);
 
   /// Return the demangle tree representation with all "__C" module
   /// names with their actual Clang module names.