Data flow: Remove unused column from flowThroughOutOfCall

github · Dec 10, 2024 · 1148b9e · 1148b9e
1 parent 0f5786e
commit 1148b9e
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
@@ -1437,14 +1437,13 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
 
         pragma[nomagic]
         private predicate flowThroughOutOfCall(
-          DataFlowCall call, CcCall ccc, RetNodeEx ret, NodeEx out, boolean allowsFieldFlow,
-          ApApprox argApa, ApApprox apa
+          DataFlowCall call, RetNodeEx ret, NodeEx out, boolean allowsFieldFlow, ApApprox argApa,
+          ApApprox apa
         ) {
           exists(ReturnKindExt kind |
             PrevStage::callEdgeReturn(call, _, ret, kind, out, allowsFieldFlow, apa) and
             PrevStage::callMayFlowThroughRev(call) and
-            PrevStage::returnMayFlowThrough(ret, argApa, apa, kind) and
-            matchesCall(ccc, call)
+            PrevStage::returnMayFlowThrough(ret, argApa, apa, kind)
           )
         }
 
@@ -1565,7 +1564,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
             ApApprox innerArgApa
           |
             fwdFlowThrough(call, cc, state, ccc, summaryCtx, t, ap, apa, stored, ret, innerArgApa) and
-            flowThroughOutOfCall(call, ccc, ret, node, allowsFieldFlow, innerArgApa, apa) and
+            flowThroughOutOfCall(call, ret, node, allowsFieldFlow, innerArgApa, apa) and
             not inBarrier(node, state) and
             if allowsFieldFlow = false then ap instanceof ApNil else any()
           )
@@ -2181,7 +2180,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
           exists(DataFlowCall call, ApApprox apa, boolean allowsFieldFlow |
             returnFlowsThrough0(call, state, ccc, ap, apa, ret,
               TSummaryCtxSome(p, _, argT, argAp, argStored), argApa) and
-            flowThroughOutOfCall(call, ccc, ret, _, allowsFieldFlow, argApa, apa) and
+            flowThroughOutOfCall(call, ret, _, allowsFieldFlow, argApa, apa) and
             pos = ret.getReturnPosition() and
             if allowsFieldFlow = false then ap instanceof ApNil else any()
           )
@@ -3212,7 +3211,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
             |
               fwdFlowThroughStep1(pn1, pn2, pn3, call, cc, state, ccc, summaryCtx, t, ap, apa,
                 stored, ret, innerArgApa) and
-              flowThroughOutOfCall(call, ccc, ret, node, allowsFieldFlow, innerArgApa, apa) and
+              flowThroughOutOfCall(call, ret, node, allowsFieldFlow, innerArgApa, apa) and
               not inBarrier(node, state) and
               if allowsFieldFlow = false then ap instanceof ApNil else any()
             )