hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-07-28 22:36:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

python: forward rather implement subtle predicates

Browse Source
This commit is contained in:
yoff
2026-07-28 14:49:18 +02:00
parent c11b4914e9
commit c516d1f0b9
1 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
python/ql/lib/semmle/python/controlflow/internal/Cfg.qll
View File

@@ -280,14 +280,7 @@ class BasicBlock extends CfgImpl::BasicBlock {
* doesn't currently expose a `dominanceFrontier` predicate at this
* level.
*/
predicate inDominanceFrontier(BasicBlock df) {
this = df.getAPredecessor() and not this = df.getImmediateDominator()
or
exists(BasicBlock prev | prev.inDominanceFrontier(df) |
this = prev.getImmediateDominator() and
not this = df.getImmediateDominator()
)
}
predicate inDominanceFrontier(BasicBlock df) { super.inDominanceFrontier(df) }
/** Holds if this basic block strictly reaches `other`. */
predicate strictlyReaches(BasicBlock other) { super.getASuccessor+() = other }
@@ -326,22 +319,7 @@ class BasicBlock extends CfgImpl::BasicBlock {
* This mirrors the legacy `ConditionBlock.controls(BB, branch)`.
*/
predicate controls(BasicBlock other, boolean branch) {
exists(BasicBlock succ |
branch = true and succ = this.getATrueSuccessor()
or
branch = false and succ = this.getAFalseSuccessor()
|
succ.dominates(other) and
// The other branch must not also reach `other` — otherwise
// `other` is not actually controlled by `branch`.
not exists(BasicBlock otherSucc |
branch = true and otherSucc = this.getAFalseSuccessor()
or
branch = false and otherSucc = this.getATrueSuccessor()
|
otherSucc.reaches(other)
)
)
super.edgeDominates(other, any(BooleanSuccessor t | t.getValue() = branch))
}
}