Skip to content

Commit 664f040

Browse files
aschackmullaschackmull
committed
Revert "Dataflow: Count callables instead of nodes for fieldFlowBranchLimit."
This reverts commit 1501a40.
1 parent 1501a40 commit 664f040

21 files changed

Lines changed: 84 additions & 252 deletions

File tree

‎cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -649,12 +649,8 @@ private predicate flowIntoCallNodeCand1(
649649
*/
650650
private int branch(Node n1, Configuration conf) {
651651
result =
652-
strictcount(DataFlowCallable callable |
653-
exists(Node n |
654-
flowOutOfCallNodeCand1(_, n1, n, conf) or flowIntoCallNodeCand1(_, n1, n, conf)
655-
|
656-
callable = n.getEnclosingCallable()
657-
)
652+
strictcount(Node n |
653+
flowOutOfCallNodeCand1(_, n1, n, conf) or flowIntoCallNodeCand1(_, n1, n, conf)
658654
)
659655
}
660656

@@ -665,12 +661,8 @@ private int branch(Node n1, Configuration conf) {
665661
*/
666662
private int join(Node n2, Configuration conf) {
667663
result =
668-
strictcount(DataFlowCallable callable |
669-
exists(Node n |
670-
flowOutOfCallNodeCand1(_, n, n2, conf) or flowIntoCallNodeCand1(_, n, n2, conf)
671-
|
672-
callable = n.getEnclosingCallable()
673-
)
664+
strictcount(Node n |
665+
flowOutOfCallNodeCand1(_, n, n2, conf) or flowIntoCallNodeCand1(_, n, n2, conf)
674666
)
675667
}
676668

‎cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -649,12 +649,8 @@ private predicate flowIntoCallNodeCand1(
649649
*/
650650
private int branch(Node n1, Configuration conf) {
651651
result =
652-
strictcount(DataFlowCallable callable |
653-
exists(Node n |
654-
flowOutOfCallNodeCand1(_, n1, n, conf) or flowIntoCallNodeCand1(_, n1, n, conf)
655-
|
656-
callable = n.getEnclosingCallable()
657-
)
652+
strictcount(Node n |
653+
flowOutOfCallNodeCand1(_, n1, n, conf) or flowIntoCallNodeCand1(_, n1, n, conf)
658654
)
659655
}
660656

@@ -665,12 +661,8 @@ private int branch(Node n1, Configuration conf) {
665661
*/
666662
private int join(Node n2, Configuration conf) {
667663
result =
668-
strictcount(DataFlowCallable callable |
669-
exists(Node n |
670-
flowOutOfCallNodeCand1(_, n, n2, conf) or flowIntoCallNodeCand1(_, n, n2, conf)
671-
|
672-
callable = n.getEnclosingCallable()
673-
)
664+
strictcount(Node n |
665+
flowOutOfCallNodeCand1(_, n, n2, conf) or flowIntoCallNodeCand1(_, n, n2, conf)
674666
)
675667
}
676668

‎cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -649,12 +649,8 @@ private predicate flowIntoCallNodeCand1(
649649
*/
650650
private int branch(Node n1, Configuration conf) {
651651
result =
652-
strictcount(DataFlowCallable callable |
653-
exists(Node n |
654-
flowOutOfCallNodeCand1(_, n1, n, conf) or flowIntoCallNodeCand1(_, n1, n, conf)
655-
|
656-
callable = n.getEnclosingCallable()
657-
)
652+
strictcount(Node n |
653+
flowOutOfCallNodeCand1(_, n1, n, conf) or flowIntoCallNodeCand1(_, n1, n, conf)
658654
)
659655
}
660656

@@ -665,12 +661,8 @@ private int branch(Node n1, Configuration conf) {
665661
*/
666662
private int join(Node n2, Configuration conf) {
667663
result =
668-
strictcount(DataFlowCallable callable |
669-
exists(Node n |
670-
flowOutOfCallNodeCand1(_, n, n2, conf) or flowIntoCallNodeCand1(_, n, n2, conf)
671-
|
672-
callable = n.getEnclosingCallable()
673-
)
664+
strictcount(Node n |
665+
flowOutOfCallNodeCand1(_, n, n2, conf) or flowIntoCallNodeCand1(_, n, n2, conf)
674666
)
675667
}
676668

‎cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -649,12 +649,8 @@ private predicate flowIntoCallNodeCand1(
649649
*/
650650
private int branch(Node n1, Configuration conf) {
651651
result =
652-
strictcount(DataFlowCallable callable |
653-
exists(Node n |
654-
flowOutOfCallNodeCand1(_, n1, n, conf) or flowIntoCallNodeCand1(_, n1, n, conf)
655-
|
656-
callable = n.getEnclosingCallable()
657-
)
652+
strictcount(Node n |
653+
flowOutOfCallNodeCand1(_, n1, n, conf) or flowIntoCallNodeCand1(_, n1, n, conf)
658654
)
659655
}
660656

@@ -665,12 +661,8 @@ private int branch(Node n1, Configuration conf) {
665661
*/
666662
private int join(Node n2, Configuration conf) {
667663
result =
668-
strictcount(DataFlowCallable callable |
669-
exists(Node n |
670-
flowOutOfCallNodeCand1(_, n, n2, conf) or flowIntoCallNodeCand1(_, n, n2, conf)
671-
|
672-
callable = n.getEnclosingCallable()
673-
)
664+
strictcount(Node n |
665+
flowOutOfCallNodeCand1(_, n, n2, conf) or flowIntoCallNodeCand1(_, n, n2, conf)
674666
)
675667
}
676668

‎cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -649,12 +649,8 @@ private predicate flowIntoCallNodeCand1(
649649
*/
650650
private int branch(Node n1, Configuration conf) {
651651
result =
652-
strictcount(DataFlowCallable callable |
653-
exists(Node n |
654-
flowOutOfCallNodeCand1(_, n1, n, conf) or flowIntoCallNodeCand1(_, n1, n, conf)
655-
|
656-
callable = n.getEnclosingCallable()
657-
)
652+
strictcount(Node n |
653+
flowOutOfCallNodeCand1(_, n1, n, conf) or flowIntoCallNodeCand1(_, n1, n, conf)
658654
)
659655
}
660656

@@ -665,12 +661,8 @@ private int branch(Node n1, Configuration conf) {
665661
*/
666662
private int join(Node n2, Configuration conf) {
667663
result =
668-
strictcount(DataFlowCallable callable |
669-
exists(Node n |
670-
flowOutOfCallNodeCand1(_, n, n2, conf) or flowIntoCallNodeCand1(_, n, n2, conf)
671-
|
672-
callable = n.getEnclosingCallable()
673-
)
664+
strictcount(Node n |
665+
flowOutOfCallNodeCand1(_, n, n2, conf) or flowIntoCallNodeCand1(_, n, n2, conf)
674666
)
675667
}
676668

‎cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -649,12 +649,8 @@ private predicate flowIntoCallNodeCand1(
649649
*/
650650
private int branch(Node n1, Configuration conf) {
651651
result =
652-
strictcount(DataFlowCallable callable |
653-
exists(Node n |
654-
flowOutOfCallNodeCand1(_, n1, n, conf) or flowIntoCallNodeCand1(_, n1, n, conf)
655-
|
656-
callable = n.getEnclosingCallable()
657-
)
652+
strictcount(Node n |
653+
flowOutOfCallNodeCand1(_, n1, n, conf) or flowIntoCallNodeCand1(_, n1, n, conf)
658654
)
659655
}
660656

@@ -665,12 +661,8 @@ private int branch(Node n1, Configuration conf) {
665661
*/
666662
private int join(Node n2, Configuration conf) {
667663
result =
668-
strictcount(DataFlowCallable callable |
669-
exists(Node n |
670-
flowOutOfCallNodeCand1(_, n, n2, conf) or flowIntoCallNodeCand1(_, n, n2, conf)
671-
|
672-
callable = n.getEnclosingCallable()
673-
)
664+
strictcount(Node n |
665+
flowOutOfCallNodeCand1(_, n, n2, conf) or flowIntoCallNodeCand1(_, n, n2, conf)
674666
)
675667
}
676668

‎cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -649,12 +649,8 @@ private predicate flowIntoCallNodeCand1(
649649
*/
650650
private int branch(Node n1, Configuration conf) {
651651
result =
652-
strictcount(DataFlowCallable callable |
653-
exists(Node n |
654-
flowOutOfCallNodeCand1(_, n1, n, conf) or flowIntoCallNodeCand1(_, n1, n, conf)
655-
|
656-
callable = n.getEnclosingCallable()
657-
)
652+
strictcount(Node n |
653+
flowOutOfCallNodeCand1(_, n1, n, conf) or flowIntoCallNodeCand1(_, n1, n, conf)
658654
)
659655
}
660656

@@ -665,12 +661,8 @@ private int branch(Node n1, Configuration conf) {
665661
*/
666662
private int join(Node n2, Configuration conf) {
667663
result =
668-
strictcount(DataFlowCallable callable |
669-
exists(Node n |
670-
flowOutOfCallNodeCand1(_, n, n2, conf) or flowIntoCallNodeCand1(_, n, n2, conf)
671-
|
672-
callable = n.getEnclosingCallable()
673-
)
664+
strictcount(Node n |
665+
flowOutOfCallNodeCand1(_, n, n2, conf) or flowIntoCallNodeCand1(_, n, n2, conf)
674666
)
675667
}
676668

‎cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -649,12 +649,8 @@ private predicate flowIntoCallNodeCand1(
649649
*/
650650
private int branch(Node n1, Configuration conf) {
651651
result =
652-
strictcount(DataFlowCallable callable |
653-
exists(Node n |
654-
flowOutOfCallNodeCand1(_, n1, n, conf) or flowIntoCallNodeCand1(_, n1, n, conf)
655-
|
656-
callable = n.getEnclosingCallable()
657-
)
652+
strictcount(Node n |
653+
flowOutOfCallNodeCand1(_, n1, n, conf) or flowIntoCallNodeCand1(_, n1, n, conf)
658654
)
659655
}
660656

@@ -665,12 +661,8 @@ private int branch(Node n1, Configuration conf) {
665661
*/
666662
private int join(Node n2, Configuration conf) {
667663
result =
668-
strictcount(DataFlowCallable callable |
669-
exists(Node n |
670-
flowOutOfCallNodeCand1(_, n, n2, conf) or flowIntoCallNodeCand1(_, n, n2, conf)
671-
|
672-
callable = n.getEnclosingCallable()
673-
)
664+
strictcount(Node n |
665+
flowOutOfCallNodeCand1(_, n, n2, conf) or flowIntoCallNodeCand1(_, n, n2, conf)
674666
)
675667
}
676668

‎cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -649,12 +649,8 @@ private predicate flowIntoCallNodeCand1(
649649
*/
650650
private int branch(Node n1, Configuration conf) {
651651
result =
652-
strictcount(DataFlowCallable callable |
653-
exists(Node n |
654-
flowOutOfCallNodeCand1(_, n1, n, conf) or flowIntoCallNodeCand1(_, n1, n, conf)
655-
|
656-
callable = n.getEnclosingCallable()
657-
)
652+
strictcount(Node n |
653+
flowOutOfCallNodeCand1(_, n1, n, conf) or flowIntoCallNodeCand1(_, n1, n, conf)
658654
)
659655
}
660656

@@ -665,12 +661,8 @@ private int branch(Node n1, Configuration conf) {
665661
*/
666662
private int join(Node n2, Configuration conf) {
667663
result =
668-
strictcount(DataFlowCallable callable |
669-
exists(Node n |
670-
flowOutOfCallNodeCand1(_, n, n2, conf) or flowIntoCallNodeCand1(_, n, n2, conf)
671-
|
672-
callable = n.getEnclosingCallable()
673-
)
664+
strictcount(Node n |
665+
flowOutOfCallNodeCand1(_, n, n2, conf) or flowIntoCallNodeCand1(_, n, n2, conf)
674666
)
675667
}
676668

‎csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -649,12 +649,8 @@ private predicate flowIntoCallNodeCand1(
649649
*/
650650
private int branch(Node n1, Configuration conf) {
651651
result =
652-
strictcount(DataFlowCallable callable |
653-
exists(Node n |
654-
flowOutOfCallNodeCand1(_, n1, n, conf) or flowIntoCallNodeCand1(_, n1, n, conf)
655-
|
656-
callable = n.getEnclosingCallable()
657-
)
652+
strictcount(Node n |
653+
flowOutOfCallNodeCand1(_, n1, n, conf) or flowIntoCallNodeCand1(_, n1, n, conf)
658654
)
659655
}
660656

@@ -665,12 +661,8 @@ private int branch(Node n1, Configuration conf) {
665661
*/
666662
private int join(Node n2, Configuration conf) {
667663
result =
668-
strictcount(DataFlowCallable callable |
669-
exists(Node n |
670-
flowOutOfCallNodeCand1(_, n, n2, conf) or flowIntoCallNodeCand1(_, n, n2, conf)
671-
|
672-
callable = n.getEnclosingCallable()
673-
)
664+
strictcount(Node n |
665+
flowOutOfCallNodeCand1(_, n, n2, conf) or flowIntoCallNodeCand1(_, n, n2, conf)
674666
)
675667
}
676668

0 commit comments

Comments
 (0)