Skip to content

[lldb] Handle storage nodes in TypeSystemSwiftTypeRef::IsAggregateType #4033

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

Draft
wants to merge 1 commit into
base: stable/20211026
Choose a base branch
from
Draft

[lldb] Handle storage nodes in TypeSystemSwiftTypeRef::IsAggregateType #4033

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
29 changes: 28 additions & 1 deletion lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1876,9 +1876,36 @@ bool TypeSystemSwiftTypeRef::IsAggregateType(opaque_compiler_type_t type) {
using namespace swift::Demangle;
Demangler dem;
NodePointer node = DemangleCanonicalType(dem, type);

if (!node)
return false;

// Peel off any storage node.
// Kind::«StorageType» > Kind::Type > Kind::«UnderlyingType»
switch (node->getKind()) {
case Node::Kind::Unmanaged:
case Node::Kind::Unowned:
case Node::Kind::Weak:
assert(node->hasChildren());
if (!node->hasChildren())
return false;
node = node->getFirstChild();
assert(node);
if (!node)
return false;
assert(node->getKind() == Node::Kind::Type);
if (node->getKind() != Node::Kind::Type)
return false;
assert(node->hasChildren());
if (!node->hasChildren())
return false;
node = node->getFirstChild();
if (!node)
return false;
break;
default:
break;
}

switch (node->getKind()) {
case Node::Kind::Structure:
case Node::Kind::Class:
Expand Down