Skip to content

Commit 92ad099

Browse files
committed
DataFlow: Remove bindingsets, remove the call column, and swap parameter and argument columns.
1 parent 3bf28cc commit 92ad099

File tree

9 files changed

+18
-81
lines changed

9 files changed

+18
-81
lines changed

cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -571,13 +571,6 @@ private class MyConsistencyConfiguration extends Consistency::ConsistencyConfigu
571571
* an additional forward or backwards branching factor that is not taken into account
572572
* when calculating the (virtual) dispatch cost.
573573
*
574-
* `call` is a call with an argument `arg` that is part of a path from a source to a sink, and
575-
* `p` is the target parameter of a callable to which `call` may resolve.
576-
*
577-
* All these values are bound by the dataflow library, and if this predicate is implemented it
578-
* should be specified with a bindingset annotation that binds all the columns.
574+
* Argument `arg` is part of a path from a source to a sink, and `p` is the target parameter.
579575
*/
580-
bindingset[call, p, arg]
581-
int getAdditionalFlowIntoCallNodeTerm(DataFlowCall call, ParameterNode p, ArgumentNode arg) {
582-
none()
583-
}
576+
int getAdditionalFlowIntoCallNodeTerm(ArgumentNode arg, ParameterNode p) { none() }

cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowPrivate.qll

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -324,13 +324,6 @@ private class MyConsistencyConfiguration extends Consistency::ConsistencyConfigu
324324
* an additional forward or backwards branching factor that is not taken into account
325325
* when calculating the (virtual) dispatch cost.
326326
*
327-
* `call` is a call with an argument `arg` that is part of a path from a source to a sink, and
328-
* `p` is the target parameter of a callable to which `call` may resolve.
329-
*
330-
* All these values are bound by the dataflow library, and if this predicate is implemented it
331-
* should be specified with a bindingset annotation that binds all the columns.
327+
* Argument `arg` is part of a path from a source to a sink, and `p` is the target parameter.
332328
*/
333-
bindingset[call, p, arg]
334-
int getAdditionalFlowIntoCallNodeTerm(DataFlowCall call, ParameterNode p, ArgumentNode arg) {
335-
none()
336-
}
329+
int getAdditionalFlowIntoCallNodeTerm(ArgumentNode arg, ParameterNode p) { none() }

cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -420,13 +420,6 @@ private class MyConsistencyConfiguration extends Consistency::ConsistencyConfigu
420420
* an additional forward or backwards branching factor that is not taken into account
421421
* when calculating the (virtual) dispatch cost.
422422
*
423-
* `call` is a call with an argument `arg` that is part of a path from a source to a sink, and
424-
* `p` is the target parameter of a callable to which `call` may resolve.
425-
*
426-
* All these values are bound by the dataflow library, and if this predicate is implemented it
427-
* should be specified with a bindingset annotation that binds all the columns.
423+
* Argument `arg` is part of a path from a source to a sink, and `p` is the target parameter.
428424
*/
429-
bindingset[call, p, arg]
430-
int getAdditionalFlowIntoCallNodeTerm(DataFlowCall call, ParameterNode p, ArgumentNode arg) {
431-
none()
432-
}
425+
int getAdditionalFlowIntoCallNodeTerm(ArgumentNode arg, ParameterNode p) { none() }

csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2380,13 +2380,6 @@ module Csv {
23802380
* an additional forward or backwards branching factor that is not taken into account
23812381
* when calculating the (virtual) dispatch cost.
23822382
*
2383-
* `call` is a call with an argument `arg` that is part of a path from a source to a sink, and
2384-
* `p` is the target parameter of a callable to which `call` may resolve.
2385-
*
2386-
* All these values are bound by the dataflow library, and if this predicate is implemented it
2387-
* should be specified with a bindingset annotation that binds all the columns.
2383+
* Argument `arg` is part of a path from a source to a sink, and `p` is the target parameter.
23882384
*/
2389-
bindingset[call, p, arg]
2390-
int getAdditionalFlowIntoCallNodeTerm(DataFlowCall call, ParameterNode p, ArgumentNode arg) {
2391-
none()
2392-
}
2385+
int getAdditionalFlowIntoCallNodeTerm(ArgumentNode arg, ParameterNode p) { none() }

go/ql/lib/semmle/go/dataflow/internal/DataFlowPrivate.qll

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -396,13 +396,6 @@ ContentApprox getContentApprox(Content c) { any() }
396396
* an additional forward or backwards branching factor that is not taken into account
397397
* when calculating the (virtual) dispatch cost.
398398
*
399-
* `call` is a call with an argument `arg` that is part of a path from a source to a sink, and
400-
* `p` is the target parameter of a callable to which `call` may resolve.
401-
*
402-
* All these values are bound by the dataflow library, and if this predicate is implemented it
403-
* should be specified with a bindingset annotation that binds all the columns.
399+
* Argument `arg` is part of a path from a source to a sink, and `p` is the target parameter.
404400
*/
405-
bindingset[call, p, arg]
406-
int getAdditionalFlowIntoCallNodeTerm(DataFlowCall call, ParameterNode p, ArgumentNode arg) {
407-
none()
408-
}
401+
int getAdditionalFlowIntoCallNodeTerm(ArgumentNode arg, ParameterNode p) { none() }

java/ql/lib/semmle/code/java/dataflow/internal/DataFlowPrivate.qll

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -484,13 +484,6 @@ predicate containerContent(Content c) {
484484
* an additional forward or backwards branching factor that is not taken into account
485485
* when calculating the (virtual) dispatch cost.
486486
*
487-
* `call` is a call with an argument `arg` that is part of a path from a source to a sink, and
488-
* `p` is the target parameter of a callable to which `call` may resolve.
489-
*
490-
* All these values are bound by the dataflow library, and if this predicate is implemented it
491-
* should be specified with a bindingset annotation that binds all the columns.
487+
* Argument `arg` is part of a path from a source to a sink, and `p` is the target parameter.
492488
*/
493-
bindingset[call, p, arg]
494-
int getAdditionalFlowIntoCallNodeTerm(DataFlowCall call, ParameterNode p, ArgumentNode arg) {
495-
none()
496-
}
489+
int getAdditionalFlowIntoCallNodeTerm(ArgumentNode arg, ParameterNode p) { none() }

python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,13 +1014,6 @@ ContentApprox getContentApprox(Content c) { any() }
10141014
* an additional forward or backwards branching factor that is not taken into account
10151015
* when calculating the (virtual) dispatch cost.
10161016
*
1017-
* `call` is a call with an argument `arg` that is part of a path from a source to a sink, and
1018-
* `p` is the target parameter of a callable to which `call` may resolve.
1019-
*
1020-
* All these values are bound by the dataflow library, and if this predicate is implemented it
1021-
* should be specified with a bindingset annotation that binds all the columns.
1017+
* Argument `arg` is part of a path from a source to a sink, and `p` is the target parameter.
10221018
*/
1023-
bindingset[call, p, arg]
1024-
int getAdditionalFlowIntoCallNodeTerm(DataFlowCall call, ParameterNode p, ArgumentNode arg) {
1025-
none()
1026-
}
1019+
int getAdditionalFlowIntoCallNodeTerm(ArgumentNode arg, ParameterNode p) { none() }

ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1504,13 +1504,6 @@ class AdditionalJumpStep extends Unit {
15041504
* an additional forward or backwards branching factor that is not taken into account
15051505
* when calculating the (virtual) dispatch cost.
15061506
*
1507-
* `call` is a call with an argument `arg` that is part of a path from a source to a sink, and
1508-
* `p` is the target parameter of a callable to which `call` may resolve.
1509-
*
1510-
* All these values are bound by the dataflow library, and if this predicate is implemented it
1511-
* should be specified with a bindingset annotation that binds all the columns.
1507+
* Argument `arg` is part of a path from a source to a sink, and `p` is the target parameter.
15121508
*/
1513-
bindingset[call, p, arg]
1514-
int getAdditionalFlowIntoCallNodeTerm(DataFlowCall call, ParameterNode p, ArgumentNode arg) {
1515-
none()
1516-
}
1509+
int getAdditionalFlowIntoCallNodeTerm(ArgumentNode arg, ParameterNode p) { none() }

swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -702,13 +702,6 @@ ContentApprox getContentApprox(Content c) { any() }
702702
* an additional forward or backwards branching factor that is not taken into account
703703
* when calculating the (virtual) dispatch cost.
704704
*
705-
* `call` is a call with an argument `arg` that is part of a path from a source to a sink, and
706-
* `p` is the target parameter of a callable to which `call` may resolve.
707-
*
708-
* All these values are bound by the dataflow library, and if this predicate is implemented it
709-
* should be specified with a bindingset annotation that binds all the columns.
705+
* Argument `arg` is part of a path from a source to a sink, and `p` is the target parameter.
710706
*/
711-
bindingset[call, p, arg]
712-
int getAdditionalFlowIntoCallNodeTerm(DataFlowCall call, ParameterNode p, ArgumentNode arg) {
713-
none()
714-
}
707+
int getAdditionalFlowIntoCallNodeTerm(ArgumentNode arg, ParameterNode p) { none() }

0 commit comments

Comments
 (0)