Merge pull request #2530 from geoffw0/hiddenqueries2

jbj · web-flow · commit 3183893a98a6 · 2020-01-13T15:23:55.000+01:00
CPP: Speed up nullCheckAssert in InconsistentCheckReturnNull.ql.
diff --git a/cpp/ql/src/Likely Bugs/InconsistentCheckReturnNull.ql b/cpp/ql/src/Likely Bugs/InconsistentCheckReturnNull.ql
@@ -25,10 +25,16 @@ predicate assertInvocation(File f, int line) {
   )
 }
 
-predicate nullCheckAssert(Expr e, Variable v, Declaration qualifier) {
-  nullCheckInCondition(e, v, qualifier) and
+class InterestingExpr extends Expr {
+  InterestingExpr() { nullCheckInCondition(this, _, _) }
+}
+
+predicate nullCheckAssert(InterestingExpr e, Variable v, Declaration qualifier) {
   exists(File f, int i |
-    e.getLocation().getStartLine() = i and e.getFile() = f and assertInvocation(f, i)
+    e.getLocation().getStartLine() = i and
+    e.getFile() = f and
+    assertInvocation(f, i) and
+    nullCheckInCondition(e, v, qualifier)
   )
 }
 

Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,16 @@ predicate assertInvocation(File f, int line) {`
`25`	`25`	`)`
`26`	`26`	`}`
`27`	`27`
`28`		`-predicate nullCheckAssert(Expr e, Variable v, Declaration qualifier) {`
`29`		`- nullCheckInCondition(e, v, qualifier) and`
	`28`	`+class InterestingExpr extends Expr {`
	`29`	`+ InterestingExpr() { nullCheckInCondition(this, _, _) }`
	`30`	`+}`
	`31`	`+`
	`32`	`+predicate nullCheckAssert(InterestingExpr e, Variable v, Declaration qualifier) {`
`30`	`33`	`exists(File f, int i \|`
`31`		`- e.getLocation().getStartLine() = i and e.getFile() = f and assertInvocation(f, i)`
	`34`	`+ e.getLocation().getStartLine() = i and`
	`35`	`+ e.getFile() = f and`
	`36`	`+ assertInvocation(f, i) and`
	`37`	`+ nullCheckInCondition(e, v, qualifier)`
`32`	`38`	`)`
`33`	`39`	`}`
`34`	`40`