Merge pull request #22717 from hvitved/unified/derived-read-store-step-multi-join

Unified: Join on both `name` and `namespace` in `derivedStoreReadStep`

Author: hvitved

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

@@ -335,14 +335,19 @@ module Track<TrackInputSig Input> {
   }
 }
 
+pragma[nomagic]
+private predicate derivedStoreReadStep0(NamespaceNode namespace, string name, NameBindingNode node2) {
+  readStep(namespace.ref(), pragma[only_bind_into](name), node2)
+}
+
 /**
  * Holds if `node1 -> node2` is derived by combining a store and a read step, with zero or more value steps and inheritance steps in-between.
  */
 pragma[nomagic]
 private predicate derivedStoreReadStep(NameBindingNode node1, NameBindingNode node2) {
   exists(NamespaceNode namespace, string name |
-    node1 = namespace.getMember(pragma[only_bind_into](name)) and // getMember() combines a store step with subsequent inheritance steps
-    readStep(namespace.ref(), pragma[only_bind_into](name), node2) and
+    node1 = namespace.getMember(name) and // getMember() combines a store step with subsequent inheritance steps
+    derivedStoreReadStep0(namespace, name, node2) and
     node1 != node2
   )
 }