C#: Handle non-unique type arguments when computing generics strings

hvitved · hvitved · commit d61a6744dd5c · 2025-06-16T14:32:53.000+02:00
diff --git a/csharp/ql/lib/semmle/code/csharp/Generics.qll b/csharp/ql/lib/semmle/code/csharp/Generics.qll
@@ -110,9 +110,10 @@ private string getTypeArgumentsToString(ConstructedGeneric cg) {
     strictconcat(Type t, int i | t = cg.getTypeArgument(i) | t.toStringWithTypes(), ", " order by i)
 }
 
+language[monotonicAggregates]
 pragma[nomagic]
 private string getTypeArgumentName(ConstructedGeneric cg, int i) {
-  result = cg.getTypeArgument(i).getName()
+  result = strictconcat(Type t | t = cg.getTypeArgument(i) | t.getName(), "/")
 }
 
 /** Gets the concatenation of the `getName()` of type arguments. */
diff --git a/csharp/ql/lib/semmle/code/csharp/commons/QualifiedName.qll b/csharp/ql/lib/semmle/code/csharp/commons/QualifiedName.qll
@@ -48,9 +48,10 @@ module QualifiedName<QualifiedNameInputSig Input> {
     )
   }
 
+  language[monotonicAggregates]
   pragma[nomagic]
   private string getTypeArgumentsQualifiedName(ConstructedGeneric cg, int i) {
-    result = getFullName(cg.getTypeArgument(i))
+    result = strictconcat(Type t | t = cg.getTypeArgument(i) | getFullName(t), "/")
   }
 
   /** Gets the concatenation of the `getFullName` of type arguments. */

Original file line number	Diff line number	Diff line change
`@@ -110,9 +110,10 @@ private string getTypeArgumentsToString(ConstructedGeneric cg) {`
`110`	`110`	`strictconcat(Type t, int i \| t = cg.getTypeArgument(i) \| t.toStringWithTypes(), ", " order by i)`
`111`	`111`	`}`
`112`	`112`
	`113`	`+language[monotonicAggregates]`
`113`	`114`	`pragma[nomagic]`
`114`	`115`	`private string getTypeArgumentName(ConstructedGeneric cg, int i) {`
`115`		`- result = cg.getTypeArgument(i).getName()`
	`116`	`+ result = strictconcat(Type t \| t = cg.getTypeArgument(i) \| t.getName(), "/")`
`116`	`117`	`}`
`117`	`118`
`118`	`119`	/** Gets the concatenation of the `getName()` of type arguments. */
Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,10 @@ module QualifiedName<QualifiedNameInputSig Input> {`
`48`	`48`	`)`
`49`	`49`	`}`
`50`	`50`
	`51`	`+ language[monotonicAggregates]`
`51`	`52`	`pragma[nomagic]`
`52`	`53`	`private string getTypeArgumentsQualifiedName(ConstructedGeneric cg, int i) {`
`53`		`- result = getFullName(cg.getTypeArgument(i))`
	`54`	`+ result = strictconcat(Type t \| t = cg.getTypeArgument(i) \| getFullName(t), "/")`
`54`	`55`	`}`
`55`	`56`
`56`	`57`	/** Gets the concatenation of the `getFullName` of type arguments. */