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

CFG: make 'while' post-order

Browse Source
This commit is contained in:
Arthur Baars
2021-02-05 15:40:55 +01:00
parent 83bcd26244
commit 4ae55a718a
2 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
ql/src/codeql_ruby/controlflow/internal/ControlFlowGraphImpl.qll
View File

@@ -1223,26 +1223,12 @@ module Trees {
}
}
private class ConditionalLoopTree extends PreOrderTree, ConditionalLoopAstNode {
private class ConditionalLoopTree extends PostOrderTree, ConditionalLoopAstNode {
final override predicate propagatesAbnormal(AstNode child) { child = this.getConditionNode() }
final override predicate last(AstNode last, Completion c) {
last(this.getConditionNode(), last, c) and
this.endLoop(c)
or
last(this.getBodyNode(), last, c) and
not c.continuesLoop() and
not c instanceof BreakCompletion and
not c instanceof RedoCompletion
or
last(this.getBodyNode(), last, c.(NestedBreakCompletion).getAnInnerCompatibleCompletion())
}
final override predicate first(AstNode first) { first(this.getConditionNode(), first) }
final override predicate succ(AstNode pred, AstNode succ, Completion c) {
pred = this and
first(this.getConditionNode(), succ) and
c instanceof SimpleCompletion
or
last(this.getConditionNode(), pred, c) and
this.continueLoop(c) and
first(this.getBodyNode(), succ)
@@ -1254,6 +1240,19 @@ module Trees {
last(this.getBodyNode(), pred, c) and
first(this.getBodyNode(), succ) and
c instanceof RedoCompletion
or
succ = this and
(
last(this.getConditionNode(), pred, c) and
this.endLoop(c)
or
last(this.getBodyNode(), pred, c) and
not c.continuesLoop() and
not c instanceof BreakCompletion and
not c instanceof RedoCompletion
or
last(this.getBodyNode(), pred, c.(NestedBreakCompletion).getAnInnerCompatibleCompletion())
)
}
}
}