[lldb] Consider local decls when getting base name of a node

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeDynamicTypeResolution.cpp

@@ -1167,36 +1167,6 @@ SwiftLanguageRuntimeImpl::GetNumFields(CompilerType type,
   }
 }
 
-/// Return the base name of the topmost nominal type.
-static llvm::StringRef GetBaseName(swift::Demangle::NodePointer node) {
-  if (!node)
-    return {};
-  using namespace swift::Demangle;
-  switch (node->getKind()) {
-  case Node::Kind::Structure:
-  case Node::Kind::Class: {
-    if (node->getNumChildren() != 2)
-      return {};
-    NodePointer ident = node->getChild(1);
-    if (ident && ident->hasText())
-      return ident->getText();
-    if (ident->getKind() == Node::Kind::PrivateDeclName) {
-      if (ident->getNumChildren() != 2)
-        return {};
-      ident = ident->getChild(1);
-      if (ident && ident->hasText())
-        return ident->getText();
-    }
-    return {};
-  }
-  default:
-    // Visit the child nodes.
-    for (NodePointer child : *node)
-      return GetBaseName(child);
-    return {};
-  }
-}
-
 static CompilerType
 GetTypeFromTypeRef(TypeSystemSwiftTypeRef &ts,
                    const swift::reflection::TypeRef *type_ref) {
@@ -1488,7 +1458,8 @@ CompilerType SwiftLanguageRuntimeImpl::GetChildCompilerTypeAtIndex(
     Demangler dem;
     auto mangled = type.GetMangledTypeName().GetStringRef();
     NodePointer type_node = dem.demangleSymbol(mangled);
-    llvm::StringRef type_name = GetBaseName(ts->CanonicalizeSugar(dem, type_node));
+    llvm::StringRef type_name = TypeSystemSwiftTypeRef::GetBaseName(
+        ts->CanonicalizeSugar(dem, type_node));
     llvm::SmallVector<SuperClassType, 2> supers;
     ForEachSuperClassType(*valobj, [&](SuperClassType sc) -> bool {
       if (!found_start) {
@@ -1497,7 +1468,7 @@ CompilerType SwiftLanguageRuntimeImpl::GetChildCompilerTypeAtIndex(
         // reach the requested type.
         if (auto *tr = sc.get_typeref()) {
           NodePointer base_class = tr->getDemangling(dem);
-          if (GetBaseName(base_class) != type_name)
+          if (TypeSystemSwiftTypeRef::GetBaseName(base_class) != type_name)
             return false;
           found_start = true;
         }

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

@@ -106,6 +106,38 @@ TypeSystemSwiftTypeRef::CanonicalizeSugar(swift::Demangle::Demangler &dem,
   });
 }
 
+llvm::StringRef
+TypeSystemSwiftTypeRef::GetBaseName(swift::Demangle::NodePointer node) {
+  if (!node)
+    return {};
+
+  using namespace swift::Demangle;
+  switch (node->getKind()) {
+  case Node::Kind::Structure:
+  case Node::Kind::Class: {
+    if (node->getNumChildren() != 2)
+      return {};
+    NodePointer ident = node->getChild(1);
+    if (ident && ident->hasText())
+      return ident->getText();
+    if (ident->getKind() == Node::Kind::PrivateDeclName ||
+        ident->getKind() == Node::Kind::LocalDeclName) {
+      if (ident->getNumChildren() != 2)
+        return {};
+      ident = ident->getChild(1);
+      if (ident && ident->hasText())
+        return ident->getText();
+    }
+    return {};
+  }
+  default:
+    // Visit the child nodes.
+    for (NodePointer child : *node)
+      return GetBaseName(child);
+    return {};
+  }
+}
+
 /// Create a mangled name for a type alias node.
 static ConstString GetTypeAlias(swift::Demangle::Demangler &dem,
                                 swift::Demangle::NodePointer node) {

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

@@ -279,6 +279,9 @@ class TypeSystemSwiftTypeRef : public TypeSystemSwift {
                            swift::Demangle::Demangler &dem,
                            llvm::StringRef mangled_name);
 
+  /// Return the base name of the topmost nominal type.
+  static llvm::StringRef GetBaseName(swift::Demangle::NodePointer node);
+
   /// Use API notes to determine the swiftified name of \p clang_decl.
   std::string GetSwiftName(const clang::Decl *clang_decl,
                            TypeSystemClang &clang_typesystem) override;

lldb/unittests/Symbol/TestTypeSystemSwiftTypeRef.cpp

@@ -705,3 +705,31 @@ TEST_F(TestTypeSystemSwiftTypeRef, IsTypedefType) {
   };
 }
 
+TEST_F(TestTypeSystemSwiftTypeRef, GetBaseName) {
+  using namespace swift::Demangle;
+  Demangler dem;
+  NodeBuilder b(dem);
+  {
+    NodePointer n = 
+            b.Node(Node::Kind::Class,
+              b.Node(Node::Kind::Function,
+                b.Node(Node::Kind::Module, "a"),
+                b.Node(Node::Kind::Identifier, "main"),
+                b.Node(Node::Kind::Type,
+                  b.Node(Node::Kind::FunctionType,
+                    b.Node(Node::Kind::ArgumentTuple,
+                      b.Node(Node::Kind::Type,
+                        b.Node(Node::Kind::Tuple)))),
+                  b.Node(Node::Kind::ReturnType,
+                    b.Node(Node::Kind::Type,
+                      b.Node(Node::Kind::Structure,
+                        b.Node(Node::Kind::Module, "Swift"),
+                        b.Node(Node::Kind::Identifier, "Int")))))),
+          b.Node(Node::Kind::LocalDeclName,
+            b.NodeWithIndex(Node::Kind::Number, 0),
+            b.Node(Node::Kind::Identifier, "Base")));
+    auto name = TypeSystemSwiftTypeRef::GetBaseName(n);
+    ASSERT_EQ(name, "Base");
+  }
+}
+