@@ -1517,7 +1517,7 @@ module MakeImpl<InputSig Lang> {
15171517
15181518 pragma [ nomagic]
15191519 private predicate fwdFlowOutCand (
1520- DataFlowCall call , DataFlowCallable inner , NodeEx out , FlowState state , CcNoCall outercc ,
1520+ DataFlowCall call , DataFlowCallable inner , NodeEx out , FlowState state ,
15211521 ParamNodeOption summaryCtx , TypOption argT , ApOption argAp , Typ t , Ap ap , ApApprox apa
15221522 ) {
15231523 exists ( RetNodeEx ret , boolean allowsFieldFlow , CcNoCall innercc |
@@ -1531,7 +1531,6 @@ module MakeImpl<InputSig Lang> {
15311531 innercc )
15321532 )
15331533 |
1534- outercc = getCallContextReturn ( inner , call ) and
15351534 if allowsFieldFlow = false then ap instanceof ApNil else any ( )
15361535 )
15371536 }
@@ -1540,8 +1539,9 @@ module MakeImpl<InputSig Lang> {
15401539 DataFlowCall call , DataFlowCallable inner , NodeEx out , FlowState state , CcNoCall outercc ,
15411540 ParamNodeOption summaryCtx , TypOption argT , ApOption argAp , Typ t , Ap ap , ApApprox apa
15421541 ) {
1543- fwdFlowOutCand ( call , inner , out , state , outercc , summaryCtx , argT , argAp , t , ap , apa ) and
1544- FwdTypeFlow:: typeFlowValidEdgeOut ( call , inner )
1542+ fwdFlowOutCand ( call , inner , out , state , summaryCtx , argT , argAp , t , ap , apa ) and
1543+ FwdTypeFlow:: typeFlowValidEdgeOut ( call , inner ) and
1544+ outercc = getCallContextReturn ( inner , call )
15451545 }
15461546
15471547 private module FwdTypeFlowInput implements TypeFlowInput {
0 commit comments