From 91b6a6573c9bb1f4e5d4b4dd66471ee1b5982151 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Thu, 9 Jan 2025 12:58:16 +0100
Subject: [PATCH] Data flow: Fix a bad join order

---
 shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
index 6232b446554e..aade89504e07 100644
--- a/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
+++ b/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
@@ -595,12 +595,18 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
       }
 
       pragma[nomagic]
-      private ReturnKindExtOption getDisallowedReturnKind(ParamNodeEx p) {
+      private ReturnKindExtOption getDisallowedReturnKind0(ParamNodeEx p) {
         if allowParameterReturnInSelfEx(p)
         then result.isNone()
         else p.isParameterOf(_, result.asSome().(ParamUpdateReturnKind).getPosition())
       }
 
+      bindingset[p]
+      pragma[inline_late]
+      private ReturnKindExtOption getDisallowedReturnKind(ParamNodeEx p) {
+        result = getDisallowedReturnKind0(p)
+      }
+
       /**
        * Holds if an argument to `call` is reached in the flow covered by `fwdFlow`.
        */