Merge pull request #22779 from hvitved/unified-constructor-instance-static

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

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

@@ -70,3 +70,7 @@ extension H // $ access=H1
 
 extension A.B.C // $ access=A access=A.B access=A.B.C
   : P { } // $ access=P
+
+A() // $ access=A
+
+A.init() // $ access=A access=A.init

unified/ql/test/library-tests/type-inference/constructors.swift

@@ -0,0 +1,10 @@
+class C1 {
+    init(_ x: Int) {}  // name=C1.init
+
+    convenience init() {  // name=C1.init_conv
+        self.init(0)  // $ target=C1.init $ SPURIOUS: target=C1.init_conv
+    }
+}
+
+var c11 = C1()  // $ type=c11:C1 target=C1.init_conv $ SPURIOUS: target=C1.init
+var c12 = C1.init()  // $ type=c12:C1 target=C1.init_conv $ SPURIOUS: target=C1.init

unified/ql/test/library-tests/type-inference/type-inference.expected

@@ -127,6 +127,8 @@ inferCertainType
 | closures.swift:61:14:61:16 | arg |  | closures.swift:60:12:60:13 | T1 |
 | closures.swift:66:9:68:9 | FunctionExpr |  | {EXTERNAL LOCATION} | Function |
 | closures.swift:66:9:68:9 | FunctionExpr | Args | {EXTERNAL LOCATION} | Tuple1 |
+| constructors.swift:2:12:2:12 | x |  | {EXTERNAL LOCATION} | Int |
+| constructors.swift:5:9:5:12 | self |  | constructors.swift:1:1:7:1 | C1 |
 | fields.swift:2:7:2:20 | inheritedField |  | {EXTERNAL LOCATION} | Int |
 | fields.swift:6:7:6:17 | storedField |  | {EXTERNAL LOCATION} | String |
 | fields.swift:7:7:7:18 | genericField |  | fields.swift:5:22:5:22 | T |
@@ -1047,6 +1049,15 @@ inferType
 | closures.swift:69:5:69:5 | _ |  | {EXTERNAL LOCATION} | String |
 | closures.swift:69:5:69:14 | ... = ... |  | {EXTERNAL LOCATION} | String |
 | closures.swift:69:9:69:14 | result |  | {EXTERNAL LOCATION} | String |
+| constructors.swift:2:12:2:12 | x |  | {EXTERNAL LOCATION} | Int |
+| constructors.swift:4:24:6:5 | Block |  | constructors.swift:1:1:7:1 | C1 |
+| constructors.swift:5:9:5:12 | self |  | constructors.swift:1:1:7:1 | C1 |
+| constructors.swift:5:9:5:20 | ... .init(...) |  | constructors.swift:1:1:7:1 | C1 |
+| constructors.swift:5:19:5:19 | 0 |  | {EXTERNAL LOCATION} | Int |
+| constructors.swift:9:5:9:7 | c11 |  | constructors.swift:1:1:7:1 | C1 |
+| constructors.swift:9:11:9:14 | C1(...) |  | constructors.swift:1:1:7:1 | C1 |
+| constructors.swift:10:5:10:7 | c12 |  | constructors.swift:1:1:7:1 | C1 |
+| constructors.swift:10:11:10:19 | ... .init(...) |  | constructors.swift:1:1:7:1 | C1 |
 | fields.swift:2:7:2:20 | inheritedField |  | {EXTERNAL LOCATION} | Int |
 | fields.swift:2:29:2:29 | 0 |  | {EXTERNAL LOCATION} | Int |
 | fields.swift:6:7:6:17 | storedField |  | {EXTERNAL LOCATION} | String |