Unified: Add constructors to both static and instance namespaces

Author: hvitved

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

@@ -56,18 +56,27 @@ class NameBindingPlugin extends Unit {
 
 /** Holds if `member` is an instance member. */
 predicate isInstanceMember(Member member) {
-  (member instanceof VariableDeclaration or member instanceof FunctionDeclaration) and
+  (
+    member instanceof VariableDeclaration or
+    member instanceof FunctionDeclaration or
+    member instanceof ConstructorDeclaration
+  ) and
   exists(ClassLikeDeclaration cls | cls.getAMember() = member |
     any(NameBindingPlugin p).isInstanceMember(cls, member)
   )
 }
 
 /**
  * Holds if `member` is a non-instance member declared in the context of a class or top-level.
+ *
+ * Instance constructors are also considered static members, in order to be able to look them
+ * up as both instance members (`self.init()`) and static members (`C1.init()`).
  */
 predicate isStaticMember(Member member) {
   exists(ClassLikeDeclaration cls | cls.getAMember() = member |
     not any(NameBindingPlugin p).isInstanceMember(cls, member)
+    or
+    member instanceof ConstructorDeclaration
   )
   or
   member = any(TopLevel t).getBody().getAStmt()

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

@@ -191,10 +191,13 @@ predicate storeStep(NameBindingNode node1, string name, NameBindingNode node2) {
     not isPrivateToLocalScope(nameDecl) and
     nameDecl.getDeclaration() = member and
     node1.isIdentifier(nameDecl) and
-    name = nameDecl.getName() and
-    if isInstanceMember(member)
-    then node2.isInstanceMemberNamespace(cls)
-    else node2.isStaticMemberNamespace(cls)
+    name = nameDecl.getName()
+  |
+    isInstanceMember(member) and
+    node2.isInstanceMemberNamespace(cls)
+    or
+    isStaticMember(member) and
+    node2.isStaticMemberNamespace(cls)
   )
   or
   exists(TopLevel top, Stmt stmt, NameBinding nameDecl |

unified/ql/lib/codeql/unified/internal/typeinference/TypeInference.qll

@@ -300,13 +300,6 @@ private module Input3 implements InputSig3 {
       override AstNode getBody() { result = ConstructorDeclaration.super.getBody() }
 
       override Identifier getNameNode() { result = ConstructorDeclaration.super.getNameNode() }
-
-      override predicate isMemberOf(ClassLikeDeclaration cls, Identifier i, string name) {
-        // todo: constructors can be inherited
-        this = cls.getAMember() and
-        i = this.getNameNode() and
-        name = i.getValue()
-      }
     }
 
     private class EnumConstructorCallable extends ConstructorDeclarationCallable instanceof EnumConstructor