hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-02-08 03:01:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

NewTypeBranches are Predicates

Browse Source
This commit is contained in:
Erik Krogh Kristensen
2021-10-17 11:58:00 +02:00
parent 2af3fb5cca
commit 055937eefb
4 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -819,7 +819,7 @@ class NewType extends TNewType, TypeDeclaration, ModuleDeclaration {
* A branch in a `newtype`.
* E.g. `Bar()` or `Baz()` in `newtype Foo = Bar() or Baz()`.
*/
class NewTypeBranch extends TNewTypeBranch, PredicateOrBuiltin, TypeDeclaration {
class NewTypeBranch extends TNewTypeBranch, Predicate, TypeDeclaration {
QL::DatatypeBranch branch;
NewTypeBranch() { this = TNewTypeBranch(branch) }
@@ -835,7 +835,7 @@ class NewTypeBranch extends TNewTypeBranch, PredicateOrBuiltin, TypeDeclaration
}
/** Gets the body of this branch. */
Formula getBody() { toQL(result) = branch.getChild(_).(QL::Body).getChild() }
override Formula getBody() { toQL(result) = branch.getChild(_).(QL::Body).getChild() }
override NewTypeBranchType getReturnType() { result.getDeclaration() = this }

3
ql/src/codeql_ql/ast/internal/AstNodes.qll
View File

@@ -193,7 +193,8 @@ QL::AstNode toQL(AST::AstNode n) {
n = TAnnotationArg(result)
}
class TPredicate = TCharPred or TClasslessPredicate or TClassPredicate or TDBRelation;
class TPredicate =
TCharPred or TClasslessPredicate or TClassPredicate or TDBRelation or TNewTypeBranch;
class TPredOrBuiltin = TPredicate or TNewTypeBranch or TBuiltin;

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

@@ -3,20 +3,13 @@ private import Builtins
private import codeql_ql.ast.internal.Module
private import codeql_ql.ast.internal.AstNodes
private class TClasslessPredicateOrNewTypeBranch = TClasslessPredicate or TNewTypeBranch;
private string getPredicateName(TClasslessPredicateOrNewTypeBranch p) {
result = p.(ClasslessPredicate).getName() or
result = p.(NewTypeBranch).getName()
}
private predicate definesPredicate(
FileOrModule m, string name, int arity, TClasslessPredicateOrNewTypeBranch p, boolean public
FileOrModule m, string name, int arity, Predicate p, boolean public
) {
m = getEnclosingModule(p) and
name = getPredicateName(p) and
name = p.getName() and
public = getPublicBool(p) and
arity = [p.(ClasslessPredicate).getArity(), count(p.(NewTypeBranch).getField(_))]
arity = p.getArity()
or
// import X
exists(Import imp, FileOrModule m0 |
@@ -40,7 +33,7 @@ private predicate definesPredicate(
cached
private module Cached {
cached
predicate resolvePredicateExpr(PredicateExpr pe, ClasslessPredicate p) {
predicate resolvePredicateExpr(PredicateExpr pe, Predicate p) {
exists(FileOrModule m, boolean public |
not exists(pe.getQualifier()) and
m = getEnclosingModule(pe).getEnclosing*() and
@@ -49,7 +42,7 @@ private module Cached {
m = pe.getQualifier().getResolvedModule() and
public = true
|
definesPredicate(m, pe.getName(), count(p.getParameter(_)), p, public)
definesPredicate(m, pe.getName(), p.getArity(), p, public)
)
}

1
ql/test/callgraph/callgraph.expected
View File

@@ -25,4 +25,5 @@ dependsOn
exprPredicate
| Foo.qll:24:22:24:31 | predicate | Foo.qll:22:3:22:32 | ClasslessPredicate myThing0 |
| Foo.qll:26:22:26:31 | predicate | Foo.qll:20:3:20:54 | ClasslessPredicate myThing2 |
| Foo.qll:47:55:47:62 | predicate | Foo.qll:42:20:42:27 | NewTypeBranch MkRoot |
| Foo.qll:47:65:47:70 | predicate | Foo.qll:44:9:44:56 | ClasslessPredicate edge |