temp

Author: hvitved

shared/namebinding/codeql/namebinding/LocalNameBinding.qll

@@ -126,9 +126,14 @@ module LocalNameBinding<LocationSig Location, LocalNameBindingInputSig<Location>
   }
 
   pragma[nomagic]
-  private AstNode getConditionChild(Conditional cond, AstNode parent, int index) {
-    parent = cond.getCondition() and
-    result = getChild(parent, index)
+  private predicate conditionHasChildAt(Conditional conditional, AstNode condition, int index) {
+    condition = conditional.getCondition() and
+    (
+      exists(getChild(condition, index))
+      or
+      // safeguard against empty conditions
+      not exists(getChild(condition, _)) and index = 0
+    )
   }
 
   /**
@@ -150,21 +155,16 @@ module LocalNameBinding<LocationSig Location, LocalNameBindingInputSig<Location>
    */
   private AstNode getChildAdj(AstNode parent, int index) {
     result = getChild(parent, index) and
-    not parent instanceof Conditional and
-    not parent = any(Conditional cond).getCondition()
-    or
-    result = parent.(Conditional).getElse() and
-    index = -1
-    or
-    result = getChild(parent.(Conditional), index) and
-    not result = parent.(Conditional).getElse()
+    not exists(Conditional cond | result = [cond.getElse(), cond.getThen()])
     or
     exists(Conditional cond |
-      result = getConditionChild(cond, parent, index)
+      parent = cond and
+      result = cond.getElse() and
+      index = -1
       or
-      result = cond.getThen() and
       exists(int last |
-        last = max(int i | exists(getConditionChild(cond, parent, i))) and
+        result = cond.getThen() and
+        last = max(int i | conditionHasChildAt(cond, parent, i)) and
         index = last + 1
       )
     )
@@ -247,6 +247,7 @@ module LocalNameBinding<LocationSig Location, LocalNameBindingInputSig<Location>
    * ```
    */
   private AstNode getParentForScoping(AstNode n) {
+    // n.getLocation().hasLocationInfo(any(string s | s.matches("%main.rs")), [112 .. 118], _, _, _) and
     not shouldBeShadowingDeclChild(_, _, _, n) and
     not exists(ShadowingDecl decl | n = [decl.getRhs(), decl.getElse()]) and
     n = getChildAdj(result, _)