Optimize return type check

Benjamin Muskalla · Benjamin Muskalla · commit 60c700366762 · 2021-08-02T17:14:44.000+02:00
diff --git a/java/ql/src/Telemetry/ExternalAPI.qll b/java/ql/src/Telemetry/ExternalAPI.qll
@@ -9,10 +9,10 @@ class ExternalAPI extends Callable {
 
   predicate isInteresting() {
     getNumberOfParameters() > 0 and
-    not (
-      getReturnType() instanceof VoidType or
-      getReturnType() instanceof PrimitiveType or
-      getReturnType() instanceof BoxedType
+    exists(Type retType | retType = getReturnType() |
+      not retType instanceof VoidType and
+      not retType instanceof PrimitiveType and
+      not retType instanceof BoxedType
     )
   }
 

Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,10 @@ class ExternalAPI extends Callable {`
`9`	`9`
`10`	`10`	`predicate isInteresting() {`
`11`	`11`	`getNumberOfParameters() > 0 and`
`12`		`- not (`
`13`		`- getReturnType() instanceof VoidType or`
`14`		`- getReturnType() instanceof PrimitiveType or`
`15`		`- getReturnType() instanceof BoxedType`
	`12`	`+ exists(Type retType \| retType = getReturnType() \|`
	`13`	`+ not retType instanceof VoidType and`
	`14`	`+ not retType instanceof PrimitiveType and`
	`15`	`+ not retType instanceof BoxedType`
`16`	`16`	`)`
`17`	`17`	`}`
`18`	`18`