Merge commit '04cbb3aa07db' from swift/release/5.5 into swift/main

Author: git apple-llvm automerger

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

@@ -3187,7 +3187,8 @@ bool TypeSystemSwiftTypeRef::IsTypedefType(opaque_compiler_type_t type) {
     using namespace swift::Demangle;
     Demangler dem;
     NodePointer node = GetDemangledType(dem, AsMangledName(type));
-    return node && node->getKind() == Node::Kind::TypeAlias;
+    return node && (node->getKind() == Node::Kind::TypeAlias ||
+                    node->getKind() == Node::Kind::BoundGenericTypeAlias);
   };
 
 #ifndef NDEBUG
@@ -3222,15 +3223,19 @@ TypeSystemSwiftTypeRef::GetTypedefedType(opaque_compiler_type_t type) {
     using namespace swift::Demangle;
     Demangler dem;
     NodePointer node = GetDemangledType(dem, AsMangledName(type));
-    if (!node || node->getKind() != Node::Kind::TypeAlias)
+    if (!node || (node->getKind() != Node::Kind::TypeAlias &&
+                  node->getKind() != Node::Kind::BoundGenericTypeAlias))
       return {};
     auto pair = ResolveTypeAlias(m_swift_ast_context, dem, node);
+    NodePointer type_node = dem.createNode(Node::Kind::Type);
     if (NodePointer resolved = std::get<swift::Demangle::NodePointer>(pair)) {
-      NodePointer type_node = dem.createNode(Node::Kind::Type);
       type_node->addChild(resolved, dem);
-      return RemangleAsType(dem, type_node);
+    } else {
+      NodePointer clang_node = GetClangTypeNode(std::get<CompilerType>(pair),
+                                                dem, m_swift_ast_context);
+      type_node->addChild(clang_node, dem);
     }
-    return std::get<CompilerType>(pair);
+    return RemangleAsType(dem, type_node);
   };
 #ifndef NDEBUG
   // We skip validation when dealing with a builtin type since builtins are

lldb/unittests/Symbol/TestTypeSystemSwiftTypeRef.cpp

@@ -688,5 +688,20 @@ TEST_F(TestTypeSystemSwiftTypeRef, IsTypedefType) {
     CompilerType t = GetCompilerType(b.Mangle(n));
     ASSERT_FALSE(t.IsTypedefType());
   };
-};
+  {
+    NodePointer n = b.GlobalType(
+        b.Node(Node::Kind::BoundGenericTypeAlias,
+               b.Node(Node::Kind::Type,
+                      b.Node(Node::Kind::TypeAlias,
+                             b.Node(Node::Kind::Module, "module"),
+                             b.Node(Node::Kind::Identifier, "SomeType"))),
+               b.Node(Node::Kind::TypeList,
+                      b.Node(Node::Kind::Type,
+                             b.Node(Node::Kind::Structure,
+                                    b.Node(Node::Kind::Module, "Swift"),
+                                    b.Node(Node::Kind::Identifier, "Int"))))));
+    CompilerType t = GetCompilerType(b.Mangle(n));
+    ASSERT_TRUE(t.IsTypedefType());
+  };
+}