Skip to content

Commit f6c3f77

Browse files
committed
QL: Remove omittable exists variables
1 parent d87c8c7 commit f6c3f77

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
lines changed

ql/ql/src/codeql_ql/style/RedundantOverrideQuery.qll

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,15 @@ private ClassPredicate getUltimateDef(ClassPredicate p) {
3030
}
3131

3232
predicate redundantOverride(ClassPredicate pred, ClassPredicate sup) {
33-
exists(MemberCall mc |
34-
forwardingOverride(pred, mc, sup) and
35-
// overridden to provide more precise QL doc
36-
not exists(pred.getQLDoc()) and
37-
// overridden to disambiguate
38-
not exists(ClassPredicate other |
39-
getUltimateDef(sup) != getUltimateDef(other) and
40-
pred.getDeclaringType().getASuperType+() = other.getDeclaringType() and
41-
not sup.overrides*(other) and
42-
other.getName() = pred.getName() and
43-
other.getArity() = pred.getArity()
44-
)
33+
forwardingOverride(pred, _, sup) and
34+
// overridden to provide more precise QL doc
35+
not exists(pred.getQLDoc()) and
36+
// overridden to disambiguate
37+
not exists(ClassPredicate other |
38+
getUltimateDef(sup) != getUltimateDef(other) and
39+
pred.getDeclaringType().getASuperType+() = other.getDeclaringType() and
40+
not sup.overrides*(other) and
41+
other.getName() = pred.getName() and
42+
other.getArity() = pred.getArity()
4543
)
4644
}

ql/ql/src/queries/style/ToStringInQueryLogic.ql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,9 @@ module DataFlow {
202202
varaccesValue(e2, v, scope)
203203
)
204204
or
205-
exists(VarDecl v, Formula f, Select sel |
205+
exists(Formula f, Select sel |
206206
getParentFormula*(f) = sel.getWhere() and
207-
varaccesValue(e1, v, f) and
207+
varaccesValue(e1, _, f) and
208208
sel.getExpr(_) = e2
209209
)
210210
or

0 commit comments

Comments
 (0)