Address review comment

hvitved · hvitved · commit aa024010b1bf · 2025-01-07T14:23:54.000+01:00
diff --git a/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
@@ -557,7 +557,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         )
         or
         // flow into a callable
-        fwdFlowInParam(_, node, _) and
+        fwdFlowIn(_, _, _, node) and
         cc = true
         or
         // flow out of a callable
@@ -594,11 +594,6 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         )
       }
 
-      pragma[nomagic]
-      private predicate fwdFlowInParam(DataFlowCall call, ParamNodeEx p, Cc cc) {
-        fwdFlowIn(call, _, cc, p)
-      }
-
       pragma[nomagic]
       private ReturnKindExtOption getDisallowedReturnKind(ParamNodeEx p) {
         if allowParameterReturnInSelfEx(p)
@@ -614,7 +609,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         DataFlowCall call, ReturnKindExtOption disallowReturnKind, Cc cc
       ) {
         exists(ParamNodeEx p |
-          fwdFlowInParam(call, p, cc) and
+          fwdFlowIn(call, _, cc, p) and
           disallowReturnKind = getDisallowedReturnKind(p)
         )
       }

Original file line number	Diff line number	Diff line change
`@@ -557,7 +557,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {`
`557`	`557`	`)`
`558`	`558`	`or`
`559`	`559`	`// flow into a callable`
`560`		`- fwdFlowInParam(_, node, _) and`
	`560`	`+ fwdFlowIn(_, _, _, node) and`
`561`	`561`	`cc = true`
`562`	`562`	`or`
`563`	`563`	`// flow out of a callable`
`@@ -594,11 +594,6 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {`
`594`	`594`	`)`
`595`	`595`	`}`
`596`	`596`
`597`		`- pragma[nomagic]`
`598`		`- private predicate fwdFlowInParam(DataFlowCall call, ParamNodeEx p, Cc cc) {`
`599`		`- fwdFlowIn(call, _, cc, p)`
`600`		`- }`
`601`		`-`
`602`	`597`	`pragma[nomagic]`
`603`	`598`	`private ReturnKindExtOption getDisallowedReturnKind(ParamNodeEx p) {`
`604`	`599`	`if allowParameterReturnInSelfEx(p)`
`@@ -614,7 +609,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {`
`614`	`609`	`DataFlowCall call, ReturnKindExtOption disallowReturnKind, Cc cc`
`615`	`610`	`) {`
`616`	`611`	`exists(ParamNodeEx p \|`
`617`		`- fwdFlowInParam(call, p, cc) and`
	`612`	`+ fwdFlowIn(call, _, cc, p) and`
`618`	`613`	`disallowReturnKind = getDisallowedReturnKind(p)`
`619`	`614`	`)`
`620`	`615`	`}`