hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 11:15:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Ruby: CFG: make VariableReferencePattern a PreOrder node

Browse Source
This commit is contained in:
Arthur Baars
2021-12-07 16:22:48 +01:00
parent e9e3ef3ea2
commit 660e52f2bf
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruby/ql/lib/codeql/ruby/controlflow/internal/Completion.qll
View File

@@ -227,6 +227,8 @@ private predicate inMatchingContext(AstNode n) {
or
n instanceof CasePattern
or
n = any(VariableReferencePattern p).getVariableAccess()
or
n = any(CasePattern c).getDesugared()
or
n.(Trees::DefaultValueParameterTree).hasDefaultValue()

2
ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImpl.qll
View File

@@ -722,7 +722,7 @@ module Trees {
override ControlFlowTree getChildElement(int i) { result = this.getPattern() and i = 0 }
}
private class VariableReferencePatternTree extends StandardPostOrderTree, VariableReferencePattern {
private class VariableReferencePatternTree extends StandardPreOrderTree, VariableReferencePattern {
override ControlFlowTree getChildElement(int i) { result = this.getVariableAccess() and i = 0 }
}

16
ruby/ql/test/library-tests/controlflow/graph/Cfg.expected
View File

@@ -1046,14 +1046,14 @@ case.rb:
#-----| match -> exit case_match_various (normal)
# 74| in ... then ...
#-----| -> foo
#-----| -> ^...
# 74| ^...
#-----| no-match -> in ... then ...
#-----| match -> exit case_match_various (normal)
#-----| -> foo
# 74| foo
#-----| -> ^...
#-----| no-match -> in ... then ...
#-----| match -> exit case_match_various (normal)
# 75| in ... then ...
#-----| -> "string"
@@ -1154,15 +1154,15 @@ case.rb:
#-----| -> 5
# 83| 5
#-----| no-match -> foo
#-----| no-match -> ^...
#-----| match -> exit case_match_various (normal)
# 83| ^...
#-----| no-match -> "string"
#-----| match -> exit case_match_various (normal)
#-----| -> foo
# 83| foo
#-----| -> ^...
#-----| no-match -> "string"
#-----| match -> exit case_match_various (normal)
# 83| "string"
#-----| no-match -> in ... then ...