Kotlin: Speed up the toString consistency query

igfoo · igfoo · commit 59307285e8d5 · 2022-05-10T19:51:00.000+01:00
Using Top.getAQlClass() means we have to evaluate
SummarizedCallableExternal's charpred, and hence summaryElement,
which is slow.
diff --git a/java/ql/consistency-queries/toString.ql b/java/ql/consistency-queries/toString.ql
@@ -20,7 +20,7 @@ string topToString(Top t) {
 }
 
 string not1ToString() {
-  exists(Top t | count(topToString(t)) != 1 and result = "Top which doesn't have exactly 1 toString: " + concat(t.getAQlClass(), ", "))
+  exists(Top t | count(topToString(t)) != 1 and result = "Top which doesn't have exactly 1 toString: " + t.getPrimaryQlClasses())
   or
   exists(Location l | count(l.toString()) != 1 and result = "Location which doesn't have exactly 1 toString: " + concat(l.getAQlClass(), ", "))
   or

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ string topToString(Top t) {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`string not1ToString() {`
`23`		`- exists(Top t \| count(topToString(t)) != 1 and result = "Top which doesn't have exactly 1 toString: " + concat(t.getAQlClass(), ", "))`
	`23`	`+ exists(Top t \| count(topToString(t)) != 1 and result = "Top which doesn't have exactly 1 toString: " + t.getPrimaryQlClasses())`
`24`	`24`	`or`
`25`	`25`	`exists(Location l \| count(l.toString()) != 1 and result = "Location which doesn't have exactly 1 toString: " + concat(l.getAQlClass(), ", "))`
`26`	`26`	`or`