From 5ba941e465430b0dd6984152da4fdb71d1e85d73 Mon Sep 17 00:00:00 2001
From: Asger F <asgerf@github.com>
Date: Wed, 29 Jul 2026 13:35:50 +0200
Subject: [PATCH] unified: Handle ConditionalPattern in local scoping

---
 unified/ql/lib/codeql/unified/internal/Variables.qll | 9 +++++++--
 unified/ql/test/library-tests/variables/test.swift   | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/unified/ql/lib/codeql/unified/internal/Variables.qll b/unified/ql/lib/codeql/unified/internal/Variables.qll
index a22cd9009dd..539f19930dc 100644
--- a/unified/ql/lib/codeql/unified/internal/Variables.qll
+++ b/unified/ql/lib/codeql/unified/internal/Variables.qll
@@ -178,12 +178,12 @@ private module LocalNameBindingInput implements LocalNameBindingInputSig<Locatio
     )
     or
     exists(CatchClause catch |
-      scope = catch and // ensure both 'body' and 'guard' clause are in scope
+      scope = catch and // ensure both body and pattern are in scope
       pattern = catch.getPattern()
     )
     or
     exists(SwitchCase case |
-      scope = case and // ensure both 'body' and 'guard' clause are in scope (TODO: merge CatchClause and SwitchCase?)
+      scope = case and // ensure both body and pattern are in scope
       pattern = case.getPattern()
     )
     or
@@ -207,6 +207,11 @@ private module LocalNameBindingInput implements LocalNameBindingInputSig<Locatio
       pattern = pat.getPattern(_)
     )
     or
+    exists(ConditionalPattern pat |
+      bindingContext(pat, scope) and
+      pattern = pat.getPattern()
+    )
+    or
     exists(PatternGuardExpr expr |
       pattern = expr.getPattern() and
       scope = expr
diff --git a/unified/ql/test/library-tests/variables/test.swift b/unified/ql/test/library-tests/variables/test.swift
index 608665b3bd5..35aac75d393 100644
--- a/unified/ql/test/library-tests/variables/test.swift
+++ b/unified/ql/test/library-tests/variables/test.swift
@@ -80,8 +80,8 @@ func t10(value: Int) { // name=value1
 // Switch with multiple cases
 func t11(value: Int) { // name=value1
     switch value { // $ access=value1
-    case let x where x > 0: // $ MISSING: access=x1 // name=x1
-        print(x) // $ MISSING: access=x1
+    case let x where x > 0: // $ access=x1 // name=x1
+        print(x) // $ access=x1
     case let x: // name=x2
         print(x) // $ access=x2
     }