hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-02-19 16:33:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

CFG: Separate scope for method blocks

Browse Source
This commit is contained in:
Tom Hvitved
2020-11-19 09:29:15 +01:00
parent 4dd4373b53
commit 4626168969
5 changed files with 62 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ql/src/codeql_ruby/controlflow/ControlFlowGraph.qll
View File

@@ -8,7 +8,18 @@ private import internal.Splitting
private import internal.Completion
/** An AST node with an associated control-flow graph. */
class CfgScope = Method; // TODO: add more cases (e.g. bodies of lambdas/do blocks)
class CfgScope extends AstNode {
private string name;
CfgScope() {
name = this.(Method).getName().toString()
or
this = any(MethodCall mc | name = "block for " + mc.getMethod()).getBlock()
}
/** Gets the name of this scope. */
string getName() { result = name }
}
/**
* A control flow node.

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

@@ -256,11 +256,7 @@ private module Trees {
}
}
private class BlockParameterTree extends LeafTree, BlockParameter { }
private class BlockParametersTree extends StandardPostOrderTree, BlockParameters {
final override AstNode getChildNode(int i) { result = this.getChild(i) }
private class BlockParametersTree extends LeafTree, BlockParameters {
override predicate isHidden() { any() }
}
@@ -282,6 +278,12 @@ private module Trees {
override predicate isHidden() { any() }
}
private class DoBlockTree extends StandardPreOrderTree, DoBlock {
final override AstNode getChildNode(int i) { result = this.getChild(i) }
override predicate isHidden() { any() }
}
private class ElseTree extends StandardPreOrderTree, Else {
final override AstNode getChildNode(int i) { result = this.getChild(i) }
@@ -382,12 +384,11 @@ private module Trees {
}
private class MethodCallTree extends StandardPostOrderTree, MethodCall {
// this.getBlock() is not included as it uses a different scope
final override AstNode getChildNode(int i) {
result = this.getArguments() and i = 0
or
result = this.getMethod() and i = 1
or
result = this.getBlock() and i = 2
}
}

7
ql/src/codeql_ruby/controlflow/internal/Splitting.qll
View File

@@ -60,7 +60,12 @@ class Split extends TSplit {
string toString() { none() }
}
private CfgScope getScope(AstNode n) { result.getAFieldOrChild*() = n }
private AstNode parent(AstNode n) {
result.getAFieldOrChild() = n and
not n instanceof CfgScope
}
private CfgScope getScope(AstNode n) { result = parent+(n) }
/**
* Holds if split kinds `sk1` and `sk2` may overlap. That is, they may apply

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

@@ -140,6 +140,22 @@ nodes
| loops.rb:21:3:21:6 | puts |
| loops.rb:21:3:21:13 | MethodCall |
| loops.rb:21:8:21:13 | String |
| loops.rb:24:1:28:3 | enter m3 |
| loops.rb:24:1:28:3 | exit m3 |
| loops.rb:24:1:28:3 | exit m3 (normal) |
| loops.rb:25:3:25:9 | Array |
| loops.rb:25:3:25:14 | Call |
| loops.rb:25:3:27:5 | MethodCall |
| loops.rb:25:4:25:4 | 1 |
| loops.rb:25:6:25:6 | 2 |
| loops.rb:25:8:25:8 | 3 |
| loops.rb:25:11:25:14 | each |
| loops.rb:25:16:27:5 | enter block for Call |
| loops.rb:25:16:27:5 | exit block for Call |
| loops.rb:25:16:27:5 | exit block for Call (normal) |
| loops.rb:26:5:26:8 | puts |
| loops.rb:26:5:26:10 | MethodCall |
| loops.rb:26:10:26:10 | x |
| raise.rb:1:1:6:3 | enter m1 |
| raise.rb:1:1:6:3 | exit m1 |
| raise.rb:1:1:6:3 | exit m1 (abnormal) |
@@ -303,6 +319,20 @@ edges
| loops.rb:21:3:21:6 | puts | loops.rb:21:3:21:13 | MethodCall | semmle.label | successor |
| loops.rb:21:3:21:13 | MethodCall | loops.rb:8:1:22:3 | exit m2 (normal) | semmle.label | successor |
| loops.rb:21:8:21:13 | String | loops.rb:21:3:21:6 | puts | semmle.label | successor |
| loops.rb:24:1:28:3 | enter m3 | loops.rb:25:4:25:4 | 1 | semmle.label | successor |
| loops.rb:24:1:28:3 | exit m3 (normal) | loops.rb:24:1:28:3 | exit m3 | semmle.label | successor |
| loops.rb:25:3:25:9 | Array | loops.rb:25:11:25:14 | each | semmle.label | successor |
| loops.rb:25:3:25:14 | Call | loops.rb:25:3:27:5 | MethodCall | semmle.label | successor |
| loops.rb:25:3:27:5 | MethodCall | loops.rb:24:1:28:3 | exit m3 (normal) | semmle.label | successor |
| loops.rb:25:4:25:4 | 1 | loops.rb:25:6:25:6 | 2 | semmle.label | successor |
| loops.rb:25:6:25:6 | 2 | loops.rb:25:8:25:8 | 3 | semmle.label | successor |
| loops.rb:25:8:25:8 | 3 | loops.rb:25:3:25:9 | Array | semmle.label | successor |
| loops.rb:25:11:25:14 | each | loops.rb:25:3:25:14 | Call | semmle.label | successor |
| loops.rb:25:16:27:5 | enter block for Call | loops.rb:26:10:26:10 | x | semmle.label | successor |
| loops.rb:25:16:27:5 | exit block for Call (normal) | loops.rb:25:16:27:5 | exit block for Call | semmle.label | successor |
| loops.rb:26:5:26:8 | puts | loops.rb:26:5:26:10 | MethodCall | semmle.label | successor |
| loops.rb:26:5:26:10 | MethodCall | loops.rb:25:16:27:5 | exit block for Call (normal) | semmle.label | successor |
| loops.rb:26:10:26:10 | x | loops.rb:26:5:26:8 | puts | semmle.label | successor |
| raise.rb:1:1:6:3 | enter m1 | raise.rb:2:3:4:5 | If | semmle.label | successor |
| raise.rb:1:1:6:3 | exit m1 (abnormal) | raise.rb:1:1:6:3 | exit m1 | semmle.label | successor |
| raise.rb:1:1:6:3 | exit m1 (normal) | raise.rb:1:1:6:3 | exit m1 | semmle.label | successor |

6
ql/test/library-tests/controlflow/graph/loops.rb
View File

@@ -20,3 +20,9 @@ def m2 x
end
puts "Done"
end
def m3
[1,2,3].each do |x|
puts x
end
end