Skip to content

Commit 1148b9e

Browse files
committed
Data flow: Remove unused column from flowThroughOutOfCall
1 parent 0f5786e commit 1148b9e

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll

+6-7
Original file line numberDiff line numberDiff line change
@@ -1437,14 +1437,13 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
14371437

14381438
pragma[nomagic]
14391439
private predicate flowThroughOutOfCall(
1440-
DataFlowCall call, CcCall ccc, RetNodeEx ret, NodeEx out, boolean allowsFieldFlow,
1441-
ApApprox argApa, ApApprox apa
1440+
DataFlowCall call, RetNodeEx ret, NodeEx out, boolean allowsFieldFlow, ApApprox argApa,
1441+
ApApprox apa
14421442
) {
14431443
exists(ReturnKindExt kind |
14441444
PrevStage::callEdgeReturn(call, _, ret, kind, out, allowsFieldFlow, apa) and
14451445
PrevStage::callMayFlowThroughRev(call) and
1446-
PrevStage::returnMayFlowThrough(ret, argApa, apa, kind) and
1447-
matchesCall(ccc, call)
1446+
PrevStage::returnMayFlowThrough(ret, argApa, apa, kind)
14481447
)
14491448
}
14501449

@@ -1565,7 +1564,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
15651564
ApApprox innerArgApa
15661565
|
15671566
fwdFlowThrough(call, cc, state, ccc, summaryCtx, t, ap, apa, stored, ret, innerArgApa) and
1568-
flowThroughOutOfCall(call, ccc, ret, node, allowsFieldFlow, innerArgApa, apa) and
1567+
flowThroughOutOfCall(call, ret, node, allowsFieldFlow, innerArgApa, apa) and
15691568
not inBarrier(node, state) and
15701569
if allowsFieldFlow = false then ap instanceof ApNil else any()
15711570
)
@@ -2181,7 +2180,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
21812180
exists(DataFlowCall call, ApApprox apa, boolean allowsFieldFlow |
21822181
returnFlowsThrough0(call, state, ccc, ap, apa, ret,
21832182
TSummaryCtxSome(p, _, argT, argAp, argStored), argApa) and
2184-
flowThroughOutOfCall(call, ccc, ret, _, allowsFieldFlow, argApa, apa) and
2183+
flowThroughOutOfCall(call, ret, _, allowsFieldFlow, argApa, apa) and
21852184
pos = ret.getReturnPosition() and
21862185
if allowsFieldFlow = false then ap instanceof ApNil else any()
21872186
)
@@ -3212,7 +3211,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
32123211
|
32133212
fwdFlowThroughStep1(pn1, pn2, pn3, call, cc, state, ccc, summaryCtx, t, ap, apa,
32143213
stored, ret, innerArgApa) and
3215-
flowThroughOutOfCall(call, ccc, ret, node, allowsFieldFlow, innerArgApa, apa) and
3214+
flowThroughOutOfCall(call, ret, node, allowsFieldFlow, innerArgApa, apa) and
32163215
not inBarrier(node, state) and
32173216
if allowsFieldFlow = false then ap instanceof ApNil else any()
32183217
)

0 commit comments

Comments
 (0)