Skip to content

[lldb] Implement TypeSystemSwiftTypeRef::IsTypedefType and TypeSystemSwiftTypeRef::GetTypedefedType #2936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 10, 2021
+62 −13
Merged

[lldb] Implement TypeSystemSwiftTypeRef::IsTypedefType and TypeSystemSwiftTypeRef::GetTypedefedType #2936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 29 additions & 2 deletions lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3148,13 +3148,40 @@ TypeSystemSwiftTypeRef::GetTypeBitAlign(opaque_compiler_type_t type,
AsMangledName(type));
return {};
}

bool TypeSystemSwiftTypeRef::IsTypedefType(opaque_compiler_type_t type) {
return m_swift_ast_context->IsTypedefType(ReconstructType(type));
auto impl = [&]() {
using namespace swift::Demangle;
Demangler dem;
NodePointer node = GetDemangledType(dem, AsMangledName(type));
return node && node->getKind() == Node::Kind::TypeAlias;
};

VALIDATE_AND_RETURN(impl, IsTypedefType, type, (ReconstructType(type)),
(ReconstructType(type)));
}

CompilerType
TypeSystemSwiftTypeRef::GetTypedefedType(opaque_compiler_type_t type) {
return m_swift_ast_context->GetTypedefedType(ReconstructType(type));
auto impl = [&]() -> CompilerType {
using namespace swift::Demangle;
Demangler dem;
NodePointer node = GetDemangledType(dem, AsMangledName(type));
if (!node || node->getKind() != Node::Kind::TypeAlias)
return {};
auto pair = ResolveTypeAlias(m_swift_ast_context, dem, node);
if (NodePointer resolved = std::get<swift::Demangle::NodePointer>(pair)) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since this function has using namespace swift::Demangle, you don't need the fully qualified <swift::Demangle::NodePointer>, it could be reduced to <NodePointer>. Feel free to merge, not worth another round of testing to change just this.

NodePointer type_node = dem.createNode(Node::Kind::Type);
type_node->addChild(resolved, dem);
return RemangleAsType(dem, type_node);
}
return std::get<CompilerType>(pair);
};

VALIDATE_AND_RETURN(impl, GetTypedefedType, type, (ReconstructType(type)),
(ReconstructType(type)));
}

CompilerType
TypeSystemSwiftTypeRef::GetFullyUnqualifiedType(opaque_compiler_type_t type) {
return m_swift_ast_context->GetFullyUnqualifiedType(ReconstructType(type));
Expand Down
44 changes: 33 additions & 11 deletions lldb/unittests/Symbol/TestTypeSystemSwiftTypeRef.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,25 +646,47 @@ TEST_F(TestTypeSystemSwiftTypeRef, GetInstanceType) {
NodeBuilder b(dem);
{
NodePointer n = b.GlobalType(
b.Node(Node::Kind::Metatype,
b.Node(Node::Kind::MetatypeRepresentation, "@thin"),
b.Node(Node::Kind::Type,
b.Node(Node::Kind::Structure,
b.Node(Node::Kind::Module, "Swift"),
b.Node(Node::Kind::Identifier, "String")))));
b.Node(Node::Kind::Metatype,
b.Node(Node::Kind::MetatypeRepresentation, "@thin"),
b.Node(Node::Kind::Type,
b.Node(Node::Kind::Structure,
b.Node(Node::Kind::Module, "Swift"),
b.Node(Node::Kind::Identifier, "String")))));

CompilerType t = GetCompilerType(b.Mangle(n));
CompilerType instance_type = m_swift_ts.GetInstanceType(t.GetOpaqueQualType());
CompilerType instance_type =
m_swift_ts.GetInstanceType(t.GetOpaqueQualType());
ASSERT_EQ(instance_type.GetMangledTypeName(), "$sSSD");
};
{
NodePointer n = b.GlobalType(
b.Node(Node::Kind::Structure,
b.Node(Node::Kind::Module, "Swift"),
b.Node(Node::Kind::Identifier, "String")));
b.Node(Node::Kind::Structure, b.Node(Node::Kind::Module, "Swift"),
b.Node(Node::Kind::Identifier, "String")));

CompilerType t = GetCompilerType(b.Mangle(n));
CompilerType instance_type = m_swift_ts.GetInstanceType(t.GetOpaqueQualType());
CompilerType instance_type =
m_swift_ts.GetInstanceType(t.GetOpaqueQualType());
ASSERT_EQ(instance_type.GetMangledTypeName(), "$sSSD");
};
};

TEST_F(TestTypeSystemSwiftTypeRef, IsTypedefType) {
using namespace swift::Demangle;
Demangler dem;
NodeBuilder b(dem);
{
NodePointer n = b.GlobalType(
b.Node(Node::Kind::TypeAlias, b.Node(Node::Kind::Module, "module"),
b.Node(Node::Kind::Identifier, "Alias")));
CompilerType t = GetCompilerType(b.Mangle(n));
ASSERT_TRUE(t.IsTypedefType());
};
{
NodePointer n = b.GlobalType(
b.Node(Node::Kind::Structure, b.Node(Node::Kind::Module, "module"),
b.Node(Node::Kind::Identifier, "SomeNotAliasedType")));
CompilerType t = GetCompilerType(b.Mangle(n));
ASSERT_FALSE(t.IsTypedefType());
};
};