resolve calls to signature predicates

erik-krogh · erik-krogh · commit 55b6f073c2cd · 2022-06-16T22:55:10.000+02:00
diff --git a/ql/ql/src/codeql_ql/ast/internal/Predicate.qll b/ql/ql/src/codeql_ql/ast/internal/Predicate.qll
@@ -69,6 +69,12 @@ private module Cached {
     |
       definesPredicate(m, pc.getPredicateName(), pc.getNumberOfArguments(), p, public)
     )
+    or
+    exists(Module mod, PredicateExpr sig |
+      mod.hasParameter(_, pc.getPredicateName(), sig) and
+      p = sig.getResolvedPredicate() and // <- this is a `signature predicate`, but that's fine.
+      sig.getArity() = pc.getNumberOfArguments()
+    )
   }
 
   private predicate resolveMemberCall(MemberCall mc, PredicateOrBuiltin p) {
diff --git a/ql/ql/src/codeql_ql/style/DeadCodeQuery.qll b/ql/ql/src/codeql_ql/style/DeadCodeQuery.qll
@@ -164,6 +164,9 @@ private AstNode aliveStep(AstNode prev) {
   result = prev.(Annotation).getAChild()
   or
   result = prev.(Predicate).getReturnType().getDeclaration()
+  or
+  // a module parameter is alive is the module is alive
+  prev.(Module).hasParameter(_, _, result)
 }
 
 private AstNode deprecated() {

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,12 @@ private module Cached {`
`69`	`69`	`\|`
`70`	`70`	`definesPredicate(m, pc.getPredicateName(), pc.getNumberOfArguments(), p, public)`
`71`	`71`	`)`
	`72`	`+ or`
	`73`	`+ exists(Module mod, PredicateExpr sig \|`
	`74`	`+ mod.hasParameter(_, pc.getPredicateName(), sig) and`
	`75`	+ p = sig.getResolvedPredicate() and // <- this is a `signature predicate`, but that's fine.
	`76`	`+ sig.getArity() = pc.getNumberOfArguments()`
	`77`	`+ )`
`72`	`78`	`}`
`73`	`79`
`74`	`80`	`private predicate resolveMemberCall(MemberCall mc, PredicateOrBuiltin p) {`
Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,9 @@ private AstNode aliveStep(AstNode prev) {`
`164`	`164`	`result = prev.(Annotation).getAChild()`
`165`	`165`	`or`
`166`	`166`	`result = prev.(Predicate).getReturnType().getDeclaration()`
	`167`	`+ or`
	`168`	`+ // a module parameter is alive is the module is alive`
	`169`	`+ prev.(Module).hasParameter(_, _, result)`
`167`	`170`	`}`
`168`	`171`
`169`	`172`	`private AstNode deprecated() {`