Skip to content

QL: Fix bad join #13534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hvitved merged 1 commit into from
Jun 22, 2023
Merged

QL: Fix bad join #13534

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions ql/ql/src/codeql_ql/ast/internal/Predicate.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,28 @@ private module Cached {
)
}

pragma[nomagic]
private ClassPredicate getClassPredicate(Class c, string name, int arity) {
result = c.getClassPredicate(name) and
arity = result.getArity()
}

pragma[nomagic]
private predicate resolveSelfClassCalls0(Class c, string name, int arity, MemberCall mc) {
mc.getBase() instanceof ThisAccess and
c = mc.getEnclosingPredicate().getParent() and
name = mc.getMemberName() and
arity = mc.getNumberOfArguments()
}

/**
* Holds if `mc` is a `this.method()` call to a predicate defined in the same class.
* helps avoid spuriously resolving to predicates in super-classes.
*/
private predicate resolveSelfClassCalls(MemberCall mc, PredicateOrBuiltin p) {
exists(Class c |
mc.getBase() instanceof ThisAccess and
c = mc.getEnclosingPredicate().getParent() and
p = c.getClassPredicate(mc.getMemberName()) and
p.getArity() = mc.getNumberOfArguments()
exists(Class c, string name, int arity |
resolveSelfClassCalls0(c, name, arity, mc) and
p = getClassPredicate(c, name, arity)
)
}

Expand Down