Swift: Fix type string representation

jketema · jketema · commit b4d2fb45ab7b · 2025-05-26T16:22:20.000+02:00
diff --git a/swift/extractor/translators/ExprTranslator.cpp b/swift/extractor/translators/ExprTranslator.cpp
@@ -691,7 +691,9 @@ codeql::CurrentContextIsolationExpr ExprTranslator::translateCurrentContextIsola
 
 codeql::TypeValueExpr ExprTranslator::translateTypeValueExpr(const swift::TypeValueExpr& expr) {
   auto entry = createExprEntry(expr);
-  entry.type_repr = dispatcher.fetchLabel(expr.getParamTypeRepr());
+  if (expr.getParamTypeRepr() && expr.getParamType()) {
+    entry.type_repr = dispatcher.fetchLabel(expr.getParamTypeRepr(), expr.getParamType());
+  }
   return entry;
 }
 
diff --git a/swift/ql/test/extractor-tests/generated/expr/TypeValueExpr/TypeValueExpr.expected b/swift/ql/test/extractor-tests/generated/expr/TypeValueExpr/TypeValueExpr.expected
@@ -1,2 +1,2 @@
-| type_value_exprs.swift:4:13:4:13 | TypeValueExpr | hasType: | yes | getTypeRepr: | type_value_exprs.swift:4:13:4:13 | (no string representation) |
-| type_value_exprs.swift:5:13:5:13 | TypeValueExpr | hasType: | yes | getTypeRepr: | type_value_exprs.swift:5:13:5:13 | (no string representation) |
+| type_value_exprs.swift:4:13:4:13 | TypeValueExpr | hasType: | yes | getTypeRepr: | type_value_exprs.swift:4:13:4:13 | N |
+| type_value_exprs.swift:5:13:5:13 | TypeValueExpr | hasType: | yes | getTypeRepr: | type_value_exprs.swift:5:13:5:13 | N |

Original file line number	Diff line number	Diff line change
`@@ -691,7 +691,9 @@ codeql::CurrentContextIsolationExpr ExprTranslator::translateCurrentContextIsola`
`691`	`691`
`692`	`692`	`codeql::TypeValueExpr ExprTranslator::translateTypeValueExpr(const swift::TypeValueExpr& expr) {`
`693`	`693`	`auto entry = createExprEntry(expr);`
`694`		`- entry.type_repr = dispatcher.fetchLabel(expr.getParamTypeRepr());`
	`694`	`+ if (expr.getParamTypeRepr() && expr.getParamType()) {`
	`695`	`+ entry.type_repr = dispatcher.fetchLabel(expr.getParamTypeRepr(), expr.getParamType());`
	`696`	`+ }`
`695`	`697`	`return entry;`
`696`	`698`	`}`
`697`	`699`