Skip to content

Swlft: force canonical type computation before using the type #14696

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
AlexDenisov merged 1 commit into from
Nov 7, 2023
Merged

Swlft: force canonical type computation before using the type #14696

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
4 changes: 3 additions & 1 deletion swift/extractor/translators/TypeTranslator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,10 @@ void TypeTranslator::fillAnyGenericType(const swift::AnyGenericType& type,
}

void TypeTranslator::fillType(const swift::TypeBase& type, codeql::Type& entry) {
entry.name = type.getString();
// Preserve the order as getCanonicalType() forces computation of the canonical type
// without which getString may crash sometimes
entry.canonical_type = dispatcher.fetchLabel(type.getCanonicalType());
entry.name = type.getString();
}

void TypeTranslator::fillArchetypeType(const swift::ArchetypeType& type, ArchetypeType& entry) {
Expand Down