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

Revert "Dataflow: Count callables instead of nodes for fieldFlowBranchLimit."

Browse Source 
This reverts commit 1501a40de8.
This commit is contained in:
Anders Schack-Mulligen
2020-10-16 12:51:50 +02:00
parent 1501a40de8
commit 664f04020f
21 changed files with 84 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
python/ql/src/experimental/dataflow/internal/DataFlowImpl.qll
View File

@@ -649,12 +649,8 @@ private predicate flowIntoCallNodeCand1(
*/
private int branch(Node n1, Configuration conf) {
result =
strictcount(DataFlowCallable callable |
exists(Node n |
flowOutOfCallNodeCand1(_, n1, n, conf) or flowIntoCallNodeCand1(_, n1, n, conf)
|
callable = n.getEnclosingCallable()
)
strictcount(Node n |
flowOutOfCallNodeCand1(_, n1, n, conf) or flowIntoCallNodeCand1(_, n1, n, conf)
)
}
@@ -665,12 +661,8 @@ private int branch(Node n1, Configuration conf) {
*/
private int join(Node n2, Configuration conf) {
result =
strictcount(DataFlowCallable callable |
exists(Node n |
flowOutOfCallNodeCand1(_, n, n2, conf) or flowIntoCallNodeCand1(_, n, n2, conf)
|
callable = n.getEnclosingCallable()
)
strictcount(Node n |
flowOutOfCallNodeCand1(_, n, n2, conf) or flowIntoCallNodeCand1(_, n, n2, conf)
)
}

16
python/ql/src/experimental/dataflow/internal/DataFlowImpl2.qll
View File

@@ -649,12 +649,8 @@ private predicate flowIntoCallNodeCand1(
*/
private int branch(Node n1, Configuration conf) {
result =
strictcount(DataFlowCallable callable |
exists(Node n |
flowOutOfCallNodeCand1(_, n1, n, conf) or flowIntoCallNodeCand1(_, n1, n, conf)
|
callable = n.getEnclosingCallable()
)
strictcount(Node n |
flowOutOfCallNodeCand1(_, n1, n, conf) or flowIntoCallNodeCand1(_, n1, n, conf)
)
}
@@ -665,12 +661,8 @@ private int branch(Node n1, Configuration conf) {
*/
private int join(Node n2, Configuration conf) {
result =
strictcount(DataFlowCallable callable |
exists(Node n |
flowOutOfCallNodeCand1(_, n, n2, conf) or flowIntoCallNodeCand1(_, n, n2, conf)
|
callable = n.getEnclosingCallable()
)
strictcount(Node n |
flowOutOfCallNodeCand1(_, n, n2, conf) or flowIntoCallNodeCand1(_, n, n2, conf)
)
}