@@ -1437,14 +1437,13 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
1437
1437
1438
1438
pragma [ nomagic]
1439
1439
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
1442
1442
) {
1443
1443
exists ( ReturnKindExt kind |
1444
1444
PrevStage:: callEdgeReturn ( call , _, ret , kind , out , allowsFieldFlow , apa ) and
1445
1445
PrevStage:: callMayFlowThroughRev ( call ) and
1446
- PrevStage:: returnMayFlowThrough ( ret , argApa , apa , kind ) and
1447
- matchesCall ( ccc , call )
1446
+ PrevStage:: returnMayFlowThrough ( ret , argApa , apa , kind )
1448
1447
)
1449
1448
}
1450
1449
@@ -1565,7 +1564,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
1565
1564
ApApprox innerArgApa
1566
1565
|
1567
1566
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
1569
1568
not inBarrier ( node , state ) and
1570
1569
if allowsFieldFlow = false then ap instanceof ApNil else any ( )
1571
1570
)
@@ -2181,7 +2180,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
2181
2180
exists ( DataFlowCall call , ApApprox apa , boolean allowsFieldFlow |
2182
2181
returnFlowsThrough0 ( call , state , ccc , ap , apa , ret ,
2183
2182
TSummaryCtxSome ( p , _, argT , argAp , argStored ) , argApa ) and
2184
- flowThroughOutOfCall ( call , ccc , ret , _, allowsFieldFlow , argApa , apa ) and
2183
+ flowThroughOutOfCall ( call , ret , _, allowsFieldFlow , argApa , apa ) and
2185
2184
pos = ret .getReturnPosition ( ) and
2186
2185
if allowsFieldFlow = false then ap instanceof ApNil else any ( )
2187
2186
)
@@ -3212,7 +3211,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
3212
3211
|
3213
3212
fwdFlowThroughStep1 ( pn1 , pn2 , pn3 , call , cc , state , ccc , summaryCtx , t , ap , apa ,
3214
3213
stored , ret , innerArgApa ) and
3215
- flowThroughOutOfCall ( call , ccc , ret , node , allowsFieldFlow , innerArgApa , apa ) and
3214
+ flowThroughOutOfCall ( call , ret , node , allowsFieldFlow , innerArgApa , apa ) and
3216
3215
not inBarrier ( node , state ) and
3217
3216
if allowsFieldFlow = false then ap instanceof ApNil else any ( )
3218
3217
)
0 commit comments