Unified: Fix bug in UnqualifiedMemberAccess.getAccessingClass()

Author: hvitved

unified/ql/lib/codeql/unified/internal/StaticNameBinding.qll

@@ -445,6 +445,16 @@ class NamespaceNode extends NameBindingNode {
     exists(this.getOwnMember(name, any(ShadowingKeyOpt opt | opt.asSome() = shadowingKey)))
   }
 
+  bindingset[n]
+  private predicate isInheritable(NameBindingNode n) {
+    isInheritableMemberNode(n) and
+    // prevent self-inheritance
+    not exists(ClassLikeDeclaration self |
+      this.isStaticMemberNamespace(self) and
+      n.isMember(self)
+    )
+  }
+
   /**
    * Gets a potential member of this namespace of the given name.
    *
@@ -457,7 +467,7 @@ class NamespaceNode extends NameBindingNode {
     or
     not this.hasOwnMemberWithShadowingKey(name, shadowingKey.asSome()) and
     result = this.getAnInheritanceParent().getMemberFull(name, shadowingKey) and
-    isInheritableMemberNode(result)
+    this.isInheritable(result)
     or
     result = this.getAnExtension().getMemberFull(name, shadowingKey)
   }
@@ -475,7 +485,7 @@ class NamespaceNode extends NameBindingNode {
         parent = this.getAnInheritanceParent() and
         not this.hasOwnMemberWithShadowingKey(name, shadowingKey.asSome()) and
         result = parent.getMember(name, shadowingKey) and
-        isInheritableMemberNode(result)
+        this.isInheritable(result)
       )
     )
   }
@@ -750,8 +760,7 @@ predicate unqualifiedMemberAccess(
   ClassLikeDeclaration accessingClass
 ) {
   CachedStage::ref() and
-  unqualifiedMemberAccessCand(pragma[only_bind_into](access), instanceAccess, target,
-    pragma[only_bind_into](accessingClass)) and
+  unqualifiedMemberAccessCand(access, instanceAccess, target, accessingClass) and
   accessingClass.getDepth() = unqualifiedMemberAccessDepth(access)
 }
 

unified/ql/test/library-tests/static-name-binding/test.expected

@@ -32,5 +32,5 @@ unqualifiedMemberAccess
 | unqualified-access.swift:13:17:13:17 | C | unqualified-access.swift:11:5:14:5 | class ASub.BSub |
 | unqualified-access.swift:16:18:16:18 | B | unqualified-access.swift:7:1:20:1 | class ASub |
 | unqualified-access.swift:18:17:18:17 | C | unqualified-access.swift:16:5:19:5 | class ASub.BSub2 |
-| unqualified-access.swift:24:16:24:19 | Leaf | unqualified-access.swift:23:5:25:5 | class Node.Leaf |
-| unqualified-access.swift:24:23:24:26 | Leaf | unqualified-access.swift:23:5:25:5 | class Node.Leaf |
+| unqualified-access.swift:24:16:24:19 | Leaf | unqualified-access.swift:22:1:26:1 | class Node |
+| unqualified-access.swift:24:23:24:26 | Leaf | unqualified-access.swift:22:1:26:1 | class Node |