hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-16 16:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10181 from erik-krogh/fixCons

Browse Source 
QL: remove consistency errors related to resolving multiple predicates from parameterized modules
This commit is contained in:
Erik Krogh Kristensen
2022-08-29 09:40:07 +02:00
committed by GitHub
parent 898689f550 dda16a0a30
commit 68bf9f39b9
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ql/ql/src/codeql_ql/ast/Ast.qll
View File

@@ -521,6 +521,9 @@ class ClasslessPredicate extends TClasslessPredicate, Predicate, ModuleDeclarati
}
override predicate isPrivate() { Predicate.super.isPrivate() }
/** Holds if this classless predicate is a signature predicate with no body. */
predicate isSignature() { not exists(this.getBody()) }
}
/**

6
ql/ql/src/codeql_ql/ast/internal/Predicate.qll
View File

@@ -209,7 +209,9 @@ module PredConsistency {
not exists(p0.getAlias())
) and
c > 1 and
resolvePredicateExpr(pe, p)
resolvePredicateExpr(pe, p) and
// parameterized modules are expected to resolve to multiple.
not exists(ClasslessPredicate sig | not sig.isSignature() and resolvePredicateExpr(pe, sig))
}
query predicate multipleResolveCall(Call call, int c, PredicateOrBuiltin p) {
@@ -225,6 +227,6 @@ module PredConsistency {
c > 1 and
resolveCall(call, p) and
// parameterized modules are expected to resolve to multiple.
not exists(Predicate sig | not exists(sig.getBody()) and resolveCall(call, sig))
not exists(ClasslessPredicate sig | not sig.isSignature() and resolveCall(call, sig))
}
}