Skip to content

Commit 4eaec39

Browse files
aschackmullaschackmull
authored
Merge pull request #8694 from aschackmull/dataflow/cleanup-unused
Dataflow: Cleanup unused column
2 parents c0f48b6 + 7beed57 commit 4eaec39

File tree

29 files changed

+290
-319
lines changed

29 files changed

+290
-319
lines changed

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,8 +1158,8 @@ private module Stage2 {
11581158
if reducedViableImplInReturn(c, call) then result = TReturn(c, call) else result = ccNone()
11591159
}
11601160

1161-
bindingset[node, cc, config]
1162-
private LocalCc getLocalCc(NodeEx node, Cc cc, Configuration config) { any() }
1161+
bindingset[node, cc]
1162+
private LocalCc getLocalCc(NodeEx node, Cc cc) { any() }
11631163

11641164
bindingset[node1, state1, config]
11651165
bindingset[node2, state2, config]
@@ -1246,7 +1246,7 @@ private module Stage2 {
12461246
or
12471247
exists(NodeEx mid, FlowState state0, Ap ap0, LocalCc localCc |
12481248
fwdFlow(mid, state0, cc, argAp, ap0, config) and
1249-
localCc = getLocalCc(mid, cc, config)
1249+
localCc = getLocalCc(mid, cc)
12501250
|
12511251
localStep(mid, state0, node, state, true, _, config, localCc) and
12521252
ap = ap0
@@ -1951,8 +1951,8 @@ private module Stage3 {
19511951
bindingset[call, c, innercc]
19521952
private CcNoCall getCallContextReturn(DataFlowCallable c, DataFlowCall call, Cc innercc) { any() }
19531953

1954-
bindingset[node, cc, config]
1955-
private LocalCc getLocalCc(NodeEx node, Cc cc, Configuration config) { any() }
1954+
bindingset[node, cc]
1955+
private LocalCc getLocalCc(NodeEx node, Cc cc) { any() }
19561956

19571957
private predicate localStep(
19581958
NodeEx node1, FlowState state1, NodeEx node2, FlowState state2, boolean preservesValue,
@@ -2035,7 +2035,7 @@ private module Stage3 {
20352035
or
20362036
exists(NodeEx mid, FlowState state0, Ap ap0, LocalCc localCc |
20372037
fwdFlow(mid, state0, cc, argAp, ap0, config) and
2038-
localCc = getLocalCc(mid, cc, config)
2038+
localCc = getLocalCc(mid, cc)
20392039
|
20402040
localStep(mid, state0, node, state, true, _, config, localCc) and
20412041
ap = ap0
@@ -2765,12 +2765,11 @@ private module Stage4 {
27652765
if reducedViableImplInReturn(c, call) then result = TReturn(c, call) else result = ccNone()
27662766
}
27672767

2768-
bindingset[node, cc, config]
2769-
private LocalCc getLocalCc(NodeEx node, Cc cc, Configuration config) {
2768+
bindingset[node, cc]
2769+
private LocalCc getLocalCc(NodeEx node, Cc cc) {
27702770
result =
27712771
getLocalCallContext(pragma[only_bind_into](pragma[only_bind_out](cc)),
2772-
node.getEnclosingCallable()) and
2773-
exists(config)
2772+
node.getEnclosingCallable())
27742773
}
27752774

27762775
private predicate localStep(
@@ -2863,7 +2862,7 @@ private module Stage4 {
28632862
or
28642863
exists(NodeEx mid, FlowState state0, Ap ap0, LocalCc localCc |
28652864
fwdFlow(mid, state0, cc, argAp, ap0, config) and
2866-
localCc = getLocalCc(mid, cc, config)
2865+
localCc = getLocalCc(mid, cc)
28672866
|
28682867
localStep(mid, state0, node, state, true, _, config, localCc) and
28692868
ap = ap0

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,8 +1158,8 @@ private module Stage2 {
11581158
if reducedViableImplInReturn(c, call) then result = TReturn(c, call) else result = ccNone()
11591159
}
11601160

1161-
bindingset[node, cc, config]
1162-
private LocalCc getLocalCc(NodeEx node, Cc cc, Configuration config) { any() }
1161+
bindingset[node, cc]
1162+
private LocalCc getLocalCc(NodeEx node, Cc cc) { any() }
11631163

11641164
bindingset[node1, state1, config]
11651165
bindingset[node2, state2, config]
@@ -1246,7 +1246,7 @@ private module Stage2 {
12461246
or
12471247
exists(NodeEx mid, FlowState state0, Ap ap0, LocalCc localCc |
12481248
fwdFlow(mid, state0, cc, argAp, ap0, config) and
1249-
localCc = getLocalCc(mid, cc, config)
1249+
localCc = getLocalCc(mid, cc)
12501250
|
12511251
localStep(mid, state0, node, state, true, _, config, localCc) and
12521252
ap = ap0
@@ -1951,8 +1951,8 @@ private module Stage3 {
19511951
bindingset[call, c, innercc]
19521952
private CcNoCall getCallContextReturn(DataFlowCallable c, DataFlowCall call, Cc innercc) { any() }
19531953

1954-
bindingset[node, cc, config]
1955-
private LocalCc getLocalCc(NodeEx node, Cc cc, Configuration config) { any() }
1954+
bindingset[node, cc]
1955+
private LocalCc getLocalCc(NodeEx node, Cc cc) { any() }
19561956

19571957
private predicate localStep(
19581958
NodeEx node1, FlowState state1, NodeEx node2, FlowState state2, boolean preservesValue,
@@ -2035,7 +2035,7 @@ private module Stage3 {
20352035
or
20362036
exists(NodeEx mid, FlowState state0, Ap ap0, LocalCc localCc |
20372037
fwdFlow(mid, state0, cc, argAp, ap0, config) and
2038-
localCc = getLocalCc(mid, cc, config)
2038+
localCc = getLocalCc(mid, cc)
20392039
|
20402040
localStep(mid, state0, node, state, true, _, config, localCc) and
20412041
ap = ap0
@@ -2765,12 +2765,11 @@ private module Stage4 {
27652765
if reducedViableImplInReturn(c, call) then result = TReturn(c, call) else result = ccNone()
27662766
}
27672767

2768-
bindingset[node, cc, config]
2769-
private LocalCc getLocalCc(NodeEx node, Cc cc, Configuration config) {
2768+
bindingset[node, cc]
2769+
private LocalCc getLocalCc(NodeEx node, Cc cc) {
27702770
result =
27712771
getLocalCallContext(pragma[only_bind_into](pragma[only_bind_out](cc)),
2772-
node.getEnclosingCallable()) and
2773-
exists(config)
2772+
node.getEnclosingCallable())
27742773
}
27752774

27762775
private predicate localStep(
@@ -2863,7 +2862,7 @@ private module Stage4 {
28632862
or
28642863
exists(NodeEx mid, FlowState state0, Ap ap0, LocalCc localCc |
28652864
fwdFlow(mid, state0, cc, argAp, ap0, config) and
2866-
localCc = getLocalCc(mid, cc, config)
2865+
localCc = getLocalCc(mid, cc)
28672866
|
28682867
localStep(mid, state0, node, state, true, _, config, localCc) and
28692868
ap = ap0

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,8 +1158,8 @@ private module Stage2 {
11581158
if reducedViableImplInReturn(c, call) then result = TReturn(c, call) else result = ccNone()
11591159
}
11601160

1161-
bindingset[node, cc, config]
1162-
private LocalCc getLocalCc(NodeEx node, Cc cc, Configuration config) { any() }
1161+
bindingset[node, cc]
1162+
private LocalCc getLocalCc(NodeEx node, Cc cc) { any() }
11631163

11641164
bindingset[node1, state1, config]
11651165
bindingset[node2, state2, config]
@@ -1246,7 +1246,7 @@ private module Stage2 {
12461246
or
12471247
exists(NodeEx mid, FlowState state0, Ap ap0, LocalCc localCc |
12481248
fwdFlow(mid, state0, cc, argAp, ap0, config) and
1249-
localCc = getLocalCc(mid, cc, config)
1249+
localCc = getLocalCc(mid, cc)
12501250
|
12511251
localStep(mid, state0, node, state, true, _, config, localCc) and
12521252
ap = ap0
@@ -1951,8 +1951,8 @@ private module Stage3 {
19511951
bindingset[call, c, innercc]
19521952
private CcNoCall getCallContextReturn(DataFlowCallable c, DataFlowCall call, Cc innercc) { any() }
19531953

1954-
bindingset[node, cc, config]
1955-
private LocalCc getLocalCc(NodeEx node, Cc cc, Configuration config) { any() }
1954+
bindingset[node, cc]
1955+
private LocalCc getLocalCc(NodeEx node, Cc cc) { any() }
19561956

19571957
private predicate localStep(
19581958
NodeEx node1, FlowState state1, NodeEx node2, FlowState state2, boolean preservesValue,
@@ -2035,7 +2035,7 @@ private module Stage3 {
20352035
or
20362036
exists(NodeEx mid, FlowState state0, Ap ap0, LocalCc localCc |
20372037
fwdFlow(mid, state0, cc, argAp, ap0, config) and
2038-
localCc = getLocalCc(mid, cc, config)
2038+
localCc = getLocalCc(mid, cc)
20392039
|
20402040
localStep(mid, state0, node, state, true, _, config, localCc) and
20412041
ap = ap0
@@ -2765,12 +2765,11 @@ private module Stage4 {
27652765
if reducedViableImplInReturn(c, call) then result = TReturn(c, call) else result = ccNone()
27662766
}
27672767

2768-
bindingset[node, cc, config]
2769-
private LocalCc getLocalCc(NodeEx node, Cc cc, Configuration config) {
2768+
bindingset[node, cc]
2769+
private LocalCc getLocalCc(NodeEx node, Cc cc) {
27702770
result =
27712771
getLocalCallContext(pragma[only_bind_into](pragma[only_bind_out](cc)),
2772-
node.getEnclosingCallable()) and
2773-
exists(config)
2772+
node.getEnclosingCallable())
27742773
}
27752774

27762775
private predicate localStep(
@@ -2863,7 +2862,7 @@ private module Stage4 {
28632862
or
28642863
exists(NodeEx mid, FlowState state0, Ap ap0, LocalCc localCc |
28652864
fwdFlow(mid, state0, cc, argAp, ap0, config) and
2866-
localCc = getLocalCc(mid, cc, config)
2865+
localCc = getLocalCc(mid, cc)
28672866
|
28682867
localStep(mid, state0, node, state, true, _, config, localCc) and
28692868
ap = ap0

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,8 +1158,8 @@ private module Stage2 {
11581158
if reducedViableImplInReturn(c, call) then result = TReturn(c, call) else result = ccNone()
11591159
}
11601160

1161-
bindingset[node, cc, config]
1162-
private LocalCc getLocalCc(NodeEx node, Cc cc, Configuration config) { any() }
1161+
bindingset[node, cc]
1162+
private LocalCc getLocalCc(NodeEx node, Cc cc) { any() }
11631163

11641164
bindingset[node1, state1, config]
11651165
bindingset[node2, state2, config]
@@ -1246,7 +1246,7 @@ private module Stage2 {
12461246
or
12471247
exists(NodeEx mid, FlowState state0, Ap ap0, LocalCc localCc |
12481248
fwdFlow(mid, state0, cc, argAp, ap0, config) and
1249-
localCc = getLocalCc(mid, cc, config)
1249+
localCc = getLocalCc(mid, cc)
12501250
|
12511251
localStep(mid, state0, node, state, true, _, config, localCc) and
12521252
ap = ap0
@@ -1951,8 +1951,8 @@ private module Stage3 {
19511951
bindingset[call, c, innercc]
19521952
private CcNoCall getCallContextReturn(DataFlowCallable c, DataFlowCall call, Cc innercc) { any() }
19531953

1954-
bindingset[node, cc, config]
1955-
private LocalCc getLocalCc(NodeEx node, Cc cc, Configuration config) { any() }
1954+
bindingset[node, cc]
1955+
private LocalCc getLocalCc(NodeEx node, Cc cc) { any() }
19561956

19571957
private predicate localStep(
19581958
NodeEx node1, FlowState state1, NodeEx node2, FlowState state2, boolean preservesValue,
@@ -2035,7 +2035,7 @@ private module Stage3 {
20352035
or
20362036
exists(NodeEx mid, FlowState state0, Ap ap0, LocalCc localCc |
20372037
fwdFlow(mid, state0, cc, argAp, ap0, config) and
2038-
localCc = getLocalCc(mid, cc, config)
2038+
localCc = getLocalCc(mid, cc)
20392039
|
20402040
localStep(mid, state0, node, state, true, _, config, localCc) and
20412041
ap = ap0
@@ -2765,12 +2765,11 @@ private module Stage4 {
27652765
if reducedViableImplInReturn(c, call) then result = TReturn(c, call) else result = ccNone()
27662766
}
27672767

2768-
bindingset[node, cc, config]
2769-
private LocalCc getLocalCc(NodeEx node, Cc cc, Configuration config) {
2768+
bindingset[node, cc]
2769+
private LocalCc getLocalCc(NodeEx node, Cc cc) {
27702770
result =
27712771
getLocalCallContext(pragma[only_bind_into](pragma[only_bind_out](cc)),
2772-
node.getEnclosingCallable()) and
2773-
exists(config)
2772+
node.getEnclosingCallable())
27742773
}
27752774

27762775
private predicate localStep(
@@ -2863,7 +2862,7 @@ private module Stage4 {
28632862
or
28642863
exists(NodeEx mid, FlowState state0, Ap ap0, LocalCc localCc |
28652864
fwdFlow(mid, state0, cc, argAp, ap0, config) and
2866-
localCc = getLocalCc(mid, cc, config)
2865+
localCc = getLocalCc(mid, cc)
28672866
|
28682867
localStep(mid, state0, node, state, true, _, config, localCc) and
28692868
ap = ap0

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,8 +1158,8 @@ private module Stage2 {
11581158
if reducedViableImplInReturn(c, call) then result = TReturn(c, call) else result = ccNone()
11591159
}
11601160

1161-
bindingset[node, cc, config]
1162-
private LocalCc getLocalCc(NodeEx node, Cc cc, Configuration config) { any() }
1161+
bindingset[node, cc]
1162+
private LocalCc getLocalCc(NodeEx node, Cc cc) { any() }
11631163

11641164
bindingset[node1, state1, config]
11651165
bindingset[node2, state2, config]
@@ -1246,7 +1246,7 @@ private module Stage2 {
12461246
or
12471247
exists(NodeEx mid, FlowState state0, Ap ap0, LocalCc localCc |
12481248
fwdFlow(mid, state0, cc, argAp, ap0, config) and
1249-
localCc = getLocalCc(mid, cc, config)
1249+
localCc = getLocalCc(mid, cc)
12501250
|
12511251
localStep(mid, state0, node, state, true, _, config, localCc) and
12521252
ap = ap0
@@ -1951,8 +1951,8 @@ private module Stage3 {
19511951
bindingset[call, c, innercc]
19521952
private CcNoCall getCallContextReturn(DataFlowCallable c, DataFlowCall call, Cc innercc) { any() }
19531953

1954-
bindingset[node, cc, config]
1955-
private LocalCc getLocalCc(NodeEx node, Cc cc, Configuration config) { any() }
1954+
bindingset[node, cc]
1955+
private LocalCc getLocalCc(NodeEx node, Cc cc) { any() }
19561956

19571957
private predicate localStep(
19581958
NodeEx node1, FlowState state1, NodeEx node2, FlowState state2, boolean preservesValue,
@@ -2035,7 +2035,7 @@ private module Stage3 {
20352035
or
20362036
exists(NodeEx mid, FlowState state0, Ap ap0, LocalCc localCc |
20372037
fwdFlow(mid, state0, cc, argAp, ap0, config) and
2038-
localCc = getLocalCc(mid, cc, config)
2038+
localCc = getLocalCc(mid, cc)
20392039
|
20402040
localStep(mid, state0, node, state, true, _, config, localCc) and
20412041
ap = ap0
@@ -2765,12 +2765,11 @@ private module Stage4 {
27652765
if reducedViableImplInReturn(c, call) then result = TReturn(c, call) else result = ccNone()
27662766
}
27672767

2768-
bindingset[node, cc, config]
2769-
private LocalCc getLocalCc(NodeEx node, Cc cc, Configuration config) {
2768+
bindingset[node, cc]
2769+
private LocalCc getLocalCc(NodeEx node, Cc cc) {
27702770
result =
27712771
getLocalCallContext(pragma[only_bind_into](pragma[only_bind_out](cc)),
2772-
node.getEnclosingCallable()) and
2773-
exists(config)
2772+
node.getEnclosingCallable())
27742773
}
27752774

27762775
private predicate localStep(
@@ -2863,7 +2862,7 @@ private module Stage4 {
28632862
or
28642863
exists(NodeEx mid, FlowState state0, Ap ap0, LocalCc localCc |
28652864
fwdFlow(mid, state0, cc, argAp, ap0, config) and
2866-
localCc = getLocalCc(mid, cc, config)
2865+
localCc = getLocalCc(mid, cc)
28672866
|
28682867
localStep(mid, state0, node, state, true, _, config, localCc) and
28692868
ap = ap0

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,8 +1158,8 @@ private module Stage2 {
11581158
if reducedViableImplInReturn(c, call) then result = TReturn(c, call) else result = ccNone()
11591159
}
11601160

1161-
bindingset[node, cc, config]
1162-
private LocalCc getLocalCc(NodeEx node, Cc cc, Configuration config) { any() }
1161+
bindingset[node, cc]
1162+
private LocalCc getLocalCc(NodeEx node, Cc cc) { any() }
11631163

11641164
bindingset[node1, state1, config]
11651165
bindingset[node2, state2, config]
@@ -1246,7 +1246,7 @@ private module Stage2 {
12461246
or
12471247
exists(NodeEx mid, FlowState state0, Ap ap0, LocalCc localCc |
12481248
fwdFlow(mid, state0, cc, argAp, ap0, config) and
1249-
localCc = getLocalCc(mid, cc, config)
1249+
localCc = getLocalCc(mid, cc)
12501250
|
12511251
localStep(mid, state0, node, state, true, _, config, localCc) and
12521252
ap = ap0
@@ -1951,8 +1951,8 @@ private module Stage3 {
19511951
bindingset[call, c, innercc]
19521952
private CcNoCall getCallContextReturn(DataFlowCallable c, DataFlowCall call, Cc innercc) { any() }
19531953

1954-
bindingset[node, cc, config]
1955-
private LocalCc getLocalCc(NodeEx node, Cc cc, Configuration config) { any() }
1954+
bindingset[node, cc]
1955+
private LocalCc getLocalCc(NodeEx node, Cc cc) { any() }
19561956

19571957
private predicate localStep(
19581958
NodeEx node1, FlowState state1, NodeEx node2, FlowState state2, boolean preservesValue,
@@ -2035,7 +2035,7 @@ private module Stage3 {
20352035
or
20362036
exists(NodeEx mid, FlowState state0, Ap ap0, LocalCc localCc |
20372037
fwdFlow(mid, state0, cc, argAp, ap0, config) and
2038-
localCc = getLocalCc(mid, cc, config)
2038+
localCc = getLocalCc(mid, cc)
20392039
|
20402040
localStep(mid, state0, node, state, true, _, config, localCc) and
20412041
ap = ap0
@@ -2765,12 +2765,11 @@ private module Stage4 {
27652765
if reducedViableImplInReturn(c, call) then result = TReturn(c, call) else result = ccNone()
27662766
}
27672767

2768-
bindingset[node, cc, config]
2769-
private LocalCc getLocalCc(NodeEx node, Cc cc, Configuration config) {
2768+
bindingset[node, cc]
2769+
private LocalCc getLocalCc(NodeEx node, Cc cc) {
27702770
result =
27712771
getLocalCallContext(pragma[only_bind_into](pragma[only_bind_out](cc)),
2772-
node.getEnclosingCallable()) and
2773-
exists(config)
2772+
node.getEnclosingCallable())
27742773
}
27752774

27762775
private predicate localStep(
@@ -2863,7 +2862,7 @@ private module Stage4 {
28632862
or
28642863
exists(NodeEx mid, FlowState state0, Ap ap0, LocalCc localCc |
28652864
fwdFlow(mid, state0, cc, argAp, ap0, config) and
2866-
localCc = getLocalCc(mid, cc, config)
2865+
localCc = getLocalCc(mid, cc)
28672866
|
28682867
localStep(mid, state0, node, state, true, _, config, localCc) and
28692868
ap = ap0

0 commit comments

Comments
 (0)