@@ -1459,8 +1459,7 @@ module MakeImpl<InputSig Lang> {
1459
1459
pragma [ nomagic]
1460
1460
private predicate fwdFlowInCand (
1461
1461
DataFlowCall call , DataFlowCallable inner , ParamNodeEx p , FlowState state , Cc outercc ,
1462
- CcCall innercc , ParamNodeOption summaryCtx , TypOption argT , ApOption argAp , Typ t , Ap ap ,
1463
- ApApprox apa
1462
+ ParamNodeOption summaryCtx , TypOption argT , ApOption argAp , Typ t , Ap ap , ApApprox apa
1464
1463
) {
1465
1464
exists ( ArgNodeEx arg , boolean allowsFieldFlow |
1466
1465
fwdFlow ( arg , state , outercc , summaryCtx , argT , argAp , t , ap , apa ) and
@@ -1471,7 +1470,6 @@ module MakeImpl<InputSig Lang> {
1471
1470
) and
1472
1471
flowIntoCallApaInlineLate ( call , inner , arg , p , allowsFieldFlow , apa )
1473
1472
|
1474
- innercc = getCallContextCall ( call , inner ) and
1475
1473
if allowsFieldFlow = false then ap instanceof ApNil else any ( )
1476
1474
)
1477
1475
}
@@ -1482,9 +1480,9 @@ module MakeImpl<InputSig Lang> {
1482
1480
ParamNodeOption summaryCtx , TypOption argT , ApOption argAp , Typ t , Ap ap , ApApprox apa
1483
1481
) {
1484
1482
exists ( DataFlowCallable inner , boolean cc |
1485
- fwdFlowInCand ( call , inner , p , state , outercc , innercc , summaryCtx , argT , argAp , t , ap ,
1486
- apa ) and
1483
+ fwdFlowInCand ( call , inner , p , state , outercc , summaryCtx , argT , argAp , t , ap , apa ) and
1487
1484
FwdTypeFlow:: typeFlowValidEdgeIn ( call , inner , cc ) and
1485
+ innercc = getCallContextCall ( call , inner ) and
1488
1486
if outercc instanceof CcCall then cc = true else cc = false
1489
1487
)
1490
1488
}
0 commit comments