Swift: all Callables can have captures [hand-written]

Author: d10c

swift/extractor/translators/DeclTranslator.cpp

@@ -334,6 +334,7 @@ void DeclTranslator::fillAbstractFunctionDecl(const swift::AbstractFunctionDecl&
   entry.params = dispatcher.fetchRepeatedLabels(*decl.getParameters());
   auto self = const_cast<swift::ParamDecl* const>(decl.getImplicitSelfDecl());
   entry.self_param = dispatcher.fetchOptionalLabel(self);
+  entry.captures = dispatcher.fetchRepeatedLabels(decl.getCaptureInfo().getCaptures());
   fillValueDecl(decl, entry);
   fillGenericContext(decl, entry);
 }

swift/ql/test/extractor-tests/generated/decl/CapturedDecl/closures.swift

@@ -8,3 +8,19 @@ func foo() {
      print(x)
      print(y) }()
 }
+
+var escape: (() -> ())? = nil
+
+func baz() {
+  var x = 0
+  func quux() {
+    x += 1
+    print(x)
+  }
+  escape = quux
+}
+
+func callEscape() {
+  baz()
+  escape?()
+}

swift/schema.py

@@ -229,6 +229,7 @@ class Callable(Element):
     self_param: optional[ParamDecl] | child
     params: list[ParamDecl] | child
     body: optional["BraceStmt"] | child | desc("The body is absent within protocol declarations.")
+    captures: list["CapturedDecl"] | child
 
 class AbstractFunctionDecl(GenericContext, ValueDecl, Callable):
     pass
@@ -340,7 +341,7 @@ class Argument(Locatable):
     expr: Expr | child
 
 class AbstractClosureExpr(Expr, Callable):
-    captures: list["CapturedDecl"] | child
+    pass
 
 class AnyTryExpr(Expr):
     sub_expr: Expr | child