From aa024010b1bf2037f190423471c690de154d317d Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Tue, 7 Jan 2025 14:23:54 +0100
Subject: [PATCH] Address review comment

---
 .../dataflow/codeql/dataflow/internal/DataFlowImpl.qll   | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
index aa3a2d4b2146..47314c418ab6 100644
--- 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)
         )
       }