Swift: initial schema change (hand-written part)

Author: d10c

swift/ql/lib/codeql/swift/elements/expr/ApplyExpr.qll

@@ -1,17 +1,18 @@
 private import codeql.swift.generated.expr.ApplyExpr
-private import codeql.swift.elements.decl.AbstractFunctionDecl
+private import codeql.swift.elements.Callable
 private import codeql.swift.elements.expr.DeclRefExpr
-private import codeql.swift.elements.expr.MethodRefExpr
+private import codeql.swift.elements.expr.MethodLookupExpr
 private import codeql.swift.elements.expr.ConstructorRefCallExpr
+private import codeql.swift.elements.decl.MethodDecl
 
 class ApplyExpr extends Generated::ApplyExpr {
-  AbstractFunctionDecl getStaticTarget() {
+  Callable getStaticTarget() {
     exists(Expr f |
       f = this.getFunction() and
       (
         result = f.(DeclRefExpr).getDecl()
         or
-        result = f.(ConstructorRefCallExpr).getFunction().(DeclRefExpr).getDecl()
+        result = f.(ConstructorRefCallExpr).getFunction().(DeclRefExpr).getDecl() // TODO: fix this
       )
     )
   }
@@ -36,11 +37,11 @@ class ApplyExpr extends Generated::ApplyExpr {
 }
 
 class MethodApplyExpr extends ApplyExpr {
-  private MethodRefExpr method;
+  private MethodLookupExpr method;
 
   MethodApplyExpr() { method = this.getFunction() }
 
-  override AbstractFunctionDecl getStaticTarget() { result = method.getMethod() }
+  override MethodDecl getStaticTarget() { result = method.getMethod() }
 
   override Expr getQualifier() { result = method.getBase() }
 }

swift/ql/lib/codeql/swift/elements/expr/BinaryExpr.qll

@@ -31,4 +31,6 @@ class BinaryExpr extends Generated::BinaryExpr {
   Expr getAnOperand() { result = [this.getLeftOperand(), this.getRightOperand()] }
 
   override string toString() { result = "... " + this.getFunction().toString() + " ..." }
+
+  override AbstractFunctionDecl getStaticTarget() { result = super.getStaticTarget() }
 }

swift/ql/lib/codeql/swift/elements/expr/ConstructorRefCallExprConstructor.qll

@@ -1,4 +1,3 @@
-// generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.Raw
 
-predicate constructConstructorRefCallExpr(Raw::ConstructorRefCallExpr id) { any() }
+predicate constructConstructorRefCallExpr(Raw::ConstructorRefCallExpr id) { none() }

swift/ql/lib/codeql/swift/elements/expr/DotSyntaxCallExprConstructor.qll

@@ -1,5 +1,3 @@
-// generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.Raw
-private import codeql.swift.generated.PureSynthConstructors
 
-predicate constructDotSyntaxCallExpr(Raw::DotSyntaxCallExpr id) { not constructMethodRefExpr(id) }
+predicate constructDotSyntaxCallExpr(Raw::DotSyntaxCallExpr id) { none() }

swift/ql/lib/codeql/swift/elements/expr/MethodRefExpr.qll renamed to swift/ql/lib/codeql/swift/elements/expr/MethodLookupExpr.qll

@@ -1,11 +1,11 @@
-private import codeql.swift.generated.expr.MethodRefExpr
+private import codeql.swift.generated.expr.MethodLookupExpr
 private import codeql.swift.elements.expr.Expr
 private import codeql.swift.elements.decl.Decl
-private import codeql.swift.elements.decl.AbstractFunctionDecl
+private import codeql.swift.elements.decl.MethodDecl
 private import codeql.swift.generated.Raw
 private import codeql.swift.generated.Synth
 
-class MethodRefExpr extends Generated::MethodRefExpr {
+class MethodLookupExpr extends Generated::MethodLookupExpr {
   override string toString() { result = "." + this.getMember().toString() }
 
   override Expr getImmediateBase() {
@@ -14,11 +14,11 @@ class MethodRefExpr extends Generated::MethodRefExpr {
 
   override Decl getImmediateMember() {
     result =
-      Synth::convertDeclFromRaw(this.getUnderlying().getFunction().(Raw::DeclRefExpr).getDecl())
+      Synth::convertDeclFromRaw(this.getUnderlying().getFunction().(Raw::DeclRefExpr).getDecl()) // TODO: FIX THIS
   }
 
-  AbstractFunctionDecl getMethod() { result = this.getMember() }
+  MethodDecl getMethod() { result = this.getMember() }
 
   cached
-  private Raw::DotSyntaxCallExpr getUnderlying() { this = Synth::TMethodRefExpr(result) }
+  private Raw::SelfApplyExpr getUnderlying() { this = Synth::TMethodLookupExpr(result) }
 }

swift/ql/lib/codeql/swift/elements/expr/MethodLookupExprConstructor.qll

@@ -0,0 +1,3 @@
+private import codeql.swift.generated.Raw
+
+predicate constructMethodLookupExpr(Raw::SelfApplyExpr id) { any() }

swift/ql/lib/codeql/swift/elements/expr/PrefixUnaryExpr.qll

@@ -19,4 +19,6 @@ class PrefixUnaryExpr extends Generated::PrefixUnaryExpr {
    * Gets the operator of this prefix unary expression (the function that is called).
    */
   AbstractFunctionDecl getOperator() { result = this.getStaticTarget() }
+
+  override AbstractFunctionDecl getStaticTarget() { result = super.getStaticTarget() }
 }

swift/ql/test/extractor-tests/generated/expr/MethodLookupExpr/method_lookups.swift

@@ -0,0 +1,54 @@
+class X {
+  static func foo(_: Int, _:Int) {}
+  class func bar() {}
+  func baz(_: Int) {}
+
+  init() {
+    let f = baz
+  }
+}
+
+actor Y {
+  static func foo(_: Int, _:Int) {}
+  func baz(_: Int) {}
+
+  init() {
+    let f = baz
+  }
+}
+
+@MainActor
+class Z {
+  static func foo(_: Int, _:Int) {}
+  class func bar() {}
+  func baz(_: Int) {}
+
+  init() {
+    let f = baz
+  }
+}
+
+do {
+  X.foo(1, 2)
+  X.bar()
+  X().baz(42)
+
+  let f = X.bar
+  let g = X().baz
+}
+
+Task {
+  Y.foo(1, 2)
+  await Y().baz(42)
+
+  let f = Y.foo
+}
+
+Task {
+  await Z.foo(1, 2)
+  await Z.bar()
+  await Z().baz(42)
+
+  let f = Z.bar
+  let g = (await Z()).baz
+}

swift/schema.py

@@ -674,8 +674,8 @@ class ConstructorRefCallExpr(SelfApplyExpr):
 class DotSyntaxCallExpr(SelfApplyExpr):
     pass
 
-@synth.from_class(DotSyntaxCallExpr)
-class MethodRefExpr(LookupExpr):
+@synth.from_class(SelfApplyExpr)
+class MethodLookupExpr(LookupExpr):
     pass
 
 class DynamicMemberRefExpr(DynamicLookupExpr):