Merge pull request github#14696 from github/alexdenisov/force-canonical-types

AlexDenisov · web-flow · commit a0e73eaab069 · 2023-11-07T10:23:16.000+01:00
Swlft: force canonical type computation before using the type
diff --git a/swift/extractor/translators/TypeTranslator.cpp b/swift/extractor/translators/TypeTranslator.cpp
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -163,8 +163,10 @@ void TypeTranslator::fillAnyGenericType(const swift::AnyGenericType& type,`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`void TypeTranslator::fillType(const swift::TypeBase& type, codeql::Type& entry) {`
`166`		`- entry.name = type.getString();`
	`166`	`+ // Preserve the order as getCanonicalType() forces computation of the canonical type`
	`167`	`+ // without which getString may crash sometimes`
`167`	`168`	`entry.canonical_type = dispatcher.fetchLabel(type.getCanonicalType());`
	`169`	`+ entry.name = type.getString();`
`168`	`170`	`}`
`169`	`171`
`170`	`172`	`void TypeTranslator::fillArchetypeType(const swift::ArchetypeType& type, ArchetypeType& entry) {`