Merge pull request #12936 from d10c/swift/rename-functions

Swift: rename ugly names in the Function AST hierarchy
2026-04-27 01:35:13 +02:00 · 2023-05-01 17:08:19 +02:00
parent a9cf6885d0 c81ea9d747
commit 383b2e183d
192 changed files with 12175 additions and 1540 deletions
--- a/swift/downgrades/ba4171b90d0665b40e9e203bac9e3d4a0b2d03ec/old.dbscheme
+++ b/swift/downgrades/ba4171b90d0665b40e9e203bac9e3d4a0b2d03ec/old.dbscheme
--- a/swift/downgrades/ba4171b90d0665b40e9e203bac9e3d4a0b2d03ec/swift.dbscheme
+++ b/swift/downgrades/ba4171b90d0665b40e9e203bac9e3d4a0b2d03ec/swift.dbscheme
--- a/swift/downgrades/ba4171b90d0665b40e9e203bac9e3d4a0b2d03ec/upgrade.properties
+++ b/swift/downgrades/ba4171b90d0665b40e9e203bac9e3d4a0b2d03ec/upgrade.properties
@@ -0,0 +1,56 @@
+description: Revert renaming the Function hierarchy
+compatibility: full
+
+abstract_storage_decl_accessor_decls.rel: reorder abstract_storage_decl_accessors (int id, int index, int accessor) id index accessor
+abstract_storage_decl_accessors.rel: delete
+
+destructor_decls.rel: reorder deinitializers (int id) id
+deinitializers.rel: delete
+
+constructor_decls.rel: reorder initializers (int id) id
+initializers.rel: delete
+
+accessor_decls.rel: reorder accessors (int id) id
+accessors.rel: delete
+
+accessor_decl_is_getter.rel: reorder accessor_is_getter (int id) id
+accessor_is_getter.rel: delete
+
+accessor_decl_is_setter.rel: reorder accessor_is_setter (int id) id
+accessor_is_setter.rel: delete
+
+accessor_decl_is_will_set.rel: reorder accessor_is_will_set (int id) id
+accessor_is_will_set.rel: delete
+
+accessor_decl_is_did_set.rel: reorder accessor_is_did_set (int id) id
+accessor_is_did_set.rel: delete
+
+accessor_decl_is_read.rel: reorder accessor_is_read (int id) id
+accessor_is_read.rel: delete
+
+accessor_decl_is_modify.rel: reorder accessor_is_modify (int id) id
+accessor_is_modify.rel: delete
+
+accessor_decl_is_unsafe_address.rel: reorder accessor_is_unsafe_address (int id) id
+accessor_is_unsafe_address.rel: delete
+
+accessor_decl_is_unsafe_mutable_address.rel: reorder accessor_is_unsafe_mutable_address (int id) id
+accessor_is_unsafe_mutable_address.rel: delete
+
+concrete_func_decls.rel: reorder named_functions (int id) id
+named_functions.rel: delete
+
+lazy_initializer_exprs.rel: reorder lazy_initialization_exprs (int id, int sub_expr) id sub_expr
+lazy_initialization_exprs.rel: delete
+
+other_constructor_decl_ref_exprs.rel: reorder other_initializer_ref_exprs (int id, int constructor_decl) id constructor_decl
+other_initializer_ref_exprs.rel: delete
+
+rebind_self_in_constructor_exprs.rel: reorder rebind_self_in_initializer_exprs (int id, int sub_expr, int self) id sub_expr self
+rebind_self_in_initializer_exprs.rel: delete
+
+closure_exprs.rel: reorder explicit_closure_exprs (int id) id
+explicit_closure_exprs.rel: delete
+
+constructor_ref_call_exprs.rel: reorder initializer_ref_call_exprs (int id) id
+initializer_ref_call_exprs.rel: delete
--- a/swift/extractor/infra/SwiftTagTraits.h
+++ b/swift/extractor/infra/SwiftTagTraits.h
@@ -77,7 +77,7 @@ MAP(swift::Expr, ExprTag)
  MAP(swift::DeclRefExpr, DeclRefExprTag)
  MAP(swift::SuperRefExpr, SuperRefExprTag)
  MAP(swift::TypeExpr, TypeExprTag)
-  MAP(swift::OtherConstructorDeclRefExpr, OtherConstructorDeclRefExprTag)
+  MAP(swift::OtherConstructorDeclRefExpr, OtherInitializerRefExprTag)
  MAP(swift::DotSyntaxBaseIgnoredExpr, DotSyntaxBaseIgnoredExprTag)
  MAP(swift::OverloadSetRefExpr, OverloadedDeclRefExprTag)  // collapsed with its only derived class OverloadedDeclRefExpr
    MAP(swift::OverloadedDeclRefExpr, OverloadedDeclRefExprTag)
@@ -108,13 +108,13 @@ MAP(swift::Expr, ExprTag)
  MAP(swift::KeyPathApplicationExpr, KeyPathApplicationExprTag)
  MAP(swift::TupleElementExpr, TupleElementExprTag)
  MAP(swift::CaptureListExpr, CaptureListExprTag)
-  MAP(swift::AbstractClosureExpr, AbstractClosureExprTag)
-    MAP(swift::ClosureExpr, ClosureExprTag)
+  MAP(swift::AbstractClosureExpr, ClosureExprTag)
+    MAP(swift::ClosureExpr, ExplicitClosureExprTag)
    MAP(swift::AutoClosureExpr, AutoClosureExprTag)
  MAP(swift::InOutExpr, InOutExprTag)
  MAP(swift::VarargExpansionExpr, VarargExpansionExprTag)
  MAP(swift::DynamicTypeExpr, DynamicTypeExprTag)
-  MAP(swift::RebindSelfInConstructorExpr, RebindSelfInConstructorExprTag)
+  MAP(swift::RebindSelfInConstructorExpr, RebindSelfInInitializerExprTag)
  MAP(swift::OpaqueValueExpr, OpaqueValueExprTag)
  MAP(swift::PropertyWrapperValuePlaceholderExpr, PropertyWrapperValuePlaceholderExprTag)
  MAP(swift::AppliedPropertyWrapperExpr, AppliedPropertyWrapperExprTag)
@@ -131,7 +131,7 @@ MAP(swift::Expr, ExprTag)
    MAP(swift::BinaryExpr, BinaryExprTag)
    MAP(swift::SelfApplyExpr, SelfApplyExprTag)
      MAP(swift::DotSyntaxCallExpr, DotSyntaxCallExprTag)
-      MAP(swift::ConstructorRefCallExpr, ConstructorRefCallExprTag)
+      MAP(swift::ConstructorRefCallExpr, InitializerRefCallExprTag)
  MAP(swift::ImplicitConversionExpr, ImplicitConversionExprTag)
    MAP(swift::LoadExpr, LoadExprTag)
    MAP(swift::DestructureTupleExpr, DestructureTupleExprTag)
@@ -178,7 +178,7 @@ MAP(swift::Expr, ExprTag)
  MAP(swift::AssignExpr, AssignExprTag)
  MAP(swift::CodeCompletionExpr, void) // only generated for code editing
  MAP(swift::UnresolvedPatternExpr, UnresolvedPatternExprTag)
-  MAP(swift::LazyInitializerExpr, LazyInitializerExprTag)
+  MAP(swift::LazyInitializerExpr, LazyInitializationExprTag)
  MAP(swift::EditorPlaceholderExpr, void)  // only generated for code editing
  MAP(swift::ObjCSelectorExpr, ObjCSelectorExprTag)
  MAP(swift::KeyPathExpr, KeyPathExprTag)
@@ -207,12 +207,12 @@ MAP(swift::Decl, DeclTag)
        MAP_CONCRETE(swift::VarDecl, ConcreteVarDeclTag)
        MAP(swift::ParamDecl, ParamDeclTag)
      MAP(swift::SubscriptDecl, SubscriptDeclTag)
-    MAP(swift::AbstractFunctionDecl, AbstractFunctionDeclTag)
-      MAP(swift::ConstructorDecl, ConstructorDeclTag)
-      MAP(swift::DestructorDecl, DestructorDeclTag)
-      MAP(swift::FuncDecl, FuncDeclTag)
-        MAP_CONCRETE(swift::FuncDecl, ConcreteFuncDeclTag)
-        MAP(swift::AccessorDecl, AccessorDeclTag)
+    MAP(swift::AbstractFunctionDecl, FunctionTag)
+      MAP(swift::ConstructorDecl, InitializerTag)
+      MAP(swift::DestructorDecl, DeinitializerTag)
+      MAP(swift::FuncDecl, AccessorOrNamedFunctionTag)
+        MAP_CONCRETE(swift::FuncDecl, NamedFunctionTag)
+        MAP(swift::AccessorDecl, AccessorTag)
    MAP(swift::EnumElementDecl, EnumElementDeclTag)
  MAP(swift::ExtensionDecl, ExtensionDeclTag)
  MAP(swift::TopLevelCodeDecl, TopLevelCodeDeclTag)
--- a/swift/extractor/translators/DeclTranslator.cpp
+++ b/swift/extractor/translators/DeclTranslator.cpp
@@ -24,22 +24,21 @@ std::string constructName(const swift::DeclName& declName) {
 }
 }  // namespace

-codeql::ConcreteFuncDecl DeclTranslator::translateFuncDecl(const swift::FuncDecl& decl) {
+codeql::NamedFunction DeclTranslator::translateFuncDecl(const swift::FuncDecl& decl) {
  auto entry = createEntry(decl);
-  fillAbstractFunctionDecl(decl, entry);
+  fillFunction(decl, entry);
  return entry;
 }

-codeql::ConstructorDecl DeclTranslator::translateConstructorDecl(
-    const swift::ConstructorDecl& decl) {
+codeql::Initializer DeclTranslator::translateConstructorDecl(const swift::ConstructorDecl& decl) {
  auto entry = createEntry(decl);
-  fillAbstractFunctionDecl(decl, entry);
+  fillFunction(decl, entry);
  return entry;
 }

-codeql::DestructorDecl DeclTranslator::translateDestructorDecl(const swift::DestructorDecl& decl) {
+codeql::Deinitializer DeclTranslator::translateDestructorDecl(const swift::DestructorDecl& decl) {
  auto entry = createEntry(decl);
-  fillAbstractFunctionDecl(decl, entry);
+  fillFunction(decl, entry);
  return entry;
 }

@@ -173,7 +172,7 @@ codeql::TypeAliasDecl DeclTranslator::translateTypeAliasDecl(const swift::TypeAl
  return entry;
 }

-codeql::AccessorDecl DeclTranslator::translateAccessorDecl(const swift::AccessorDecl& decl) {
+codeql::Accessor DeclTranslator::translateAccessorDecl(const swift::AccessorDecl& decl) {
  auto entry = createEntry(decl);
  switch (decl.getAccessorKind()) {
    case swift::AccessorKind::Get:
@@ -201,7 +200,7 @@ codeql::AccessorDecl DeclTranslator::translateAccessorDecl(const swift::Accessor
      entry.is_unsafe_mutable_address = true;
      break;
  }
-  fillAbstractFunctionDecl(decl, entry);
+  fillFunction(decl, entry);
  return entry;
 }

@@ -251,8 +250,8 @@ codeql::ModuleDecl DeclTranslator::translateModuleDecl(const swift::ModuleDecl&
  return entry;
 }

-void DeclTranslator::fillAbstractFunctionDecl(const swift::AbstractFunctionDecl& decl,
-                                              codeql::AbstractFunctionDecl& entry) {
+void DeclTranslator::fillFunction(const swift::AbstractFunctionDecl& decl,
+                                  codeql::Function& entry) {
  assert(decl.hasParameterList() && "Expect functions to have a parameter list");
  entry.name = !decl.hasName() ? "(unnamed function decl)" : constructName(decl.getName());
  entry.body = dispatcher.fetchOptionalLabel(decl.getBody());
@@ -328,7 +327,7 @@ void DeclTranslator::fillValueDecl(const swift::ValueDecl& decl, codeql::ValueDe

 void DeclTranslator::fillAbstractStorageDecl(const swift::AbstractStorageDecl& decl,
                                             codeql::AbstractStorageDecl& entry) {
-  entry.accessor_decls = dispatcher.fetchRepeatedLabels(decl.getAllAccessors());
+  entry.accessors = dispatcher.fetchRepeatedLabels(decl.getAllAccessors());
  fillValueDecl(decl, entry);
 }

--- a/swift/extractor/translators/DeclTranslator.h
+++ b/swift/extractor/translators/DeclTranslator.h
@@ -16,9 +16,9 @@ class DeclTranslator : public AstTranslatorBase<DeclTranslator> {
 public:
  using AstTranslatorBase<DeclTranslator>::AstTranslatorBase;

-  codeql::ConcreteFuncDecl translateFuncDecl(const swift::FuncDecl& decl);
-  codeql::ConstructorDecl translateConstructorDecl(const swift::ConstructorDecl& decl);
-  codeql::DestructorDecl translateDestructorDecl(const swift::DestructorDecl& decl);
+  codeql::NamedFunction translateFuncDecl(const swift::FuncDecl& decl);
+  codeql::Initializer translateConstructorDecl(const swift::ConstructorDecl& decl);
+  codeql::Deinitializer translateDestructorDecl(const swift::DestructorDecl& decl);
  codeql::PrefixOperatorDecl translatePrefixOperatorDecl(const swift::PrefixOperatorDecl& decl);
  codeql::PostfixOperatorDecl translatePostfixOperatorDecl(const swift::PostfixOperatorDecl& decl);
  codeql::InfixOperatorDecl translateInfixOperatorDecl(const swift::InfixOperatorDecl& decl);
@@ -37,7 +37,7 @@ class DeclTranslator : public AstTranslatorBase<DeclTranslator> {
      const swift::GenericTypeParamDecl& decl);
  codeql::AssociatedTypeDecl translateAssociatedTypeDecl(const swift::AssociatedTypeDecl& decl);
  codeql::TypeAliasDecl translateTypeAliasDecl(const swift::TypeAliasDecl& decl);
-  codeql::AccessorDecl translateAccessorDecl(const swift::AccessorDecl& decl);
+  codeql::Accessor translateAccessorDecl(const swift::AccessorDecl& decl);
  codeql::SubscriptDecl translateSubscriptDecl(const swift::SubscriptDecl& decl);
  codeql::ExtensionDecl translateExtensionDecl(const swift::ExtensionDecl& decl);
  codeql::ImportDecl translateImportDecl(const swift::ImportDecl& decl);
@@ -49,8 +49,7 @@ class DeclTranslator : public AstTranslatorBase<DeclTranslator> {
  codeql::CapturedDecl translateCapturedValue(const swift::CapturedValue& capture);

 private:
-  void fillAbstractFunctionDecl(const swift::AbstractFunctionDecl& decl,
-                                codeql::AbstractFunctionDecl& entry);
+  void fillFunction(const swift::AbstractFunctionDecl& decl, codeql::Function& entry);
  void fillOperatorDecl(const swift::OperatorDecl& decl, codeql::OperatorDecl& entry);
  void fillTypeDecl(const swift::TypeDecl& decl, codeql::TypeDecl& entry);
  void fillIterableDeclContext(const swift::IterableDeclContext& decl, codeql::Decl& entry);
--- a/swift/extractor/translators/ExprTranslator.cpp
+++ b/swift/extractor/translators/ExprTranslator.cpp
@@ -211,7 +211,7 @@ codeql::OptionalEvaluationExpr ExprTranslator::translateOptionalEvaluationExpr(
  return entry;
 }

-codeql::RebindSelfInConstructorExpr ExprTranslator::translateRebindSelfInConstructorExpr(
+codeql::RebindSelfInInitializerExpr ExprTranslator::translateRebindSelfInConstructorExpr(
    const swift::RebindSelfInConstructorExpr& expr) {
  auto entry = createExprEntry(expr);
  entry.sub_expr = dispatcher.fetchLabel(expr.getSubExpr());
@@ -300,7 +300,7 @@ codeql::OptionalTryExpr ExprTranslator::translateOptionalTryExpr(
  return entry;
 }

-codeql::ConstructorRefCallExpr ExprTranslator::translateConstructorRefCallExpr(
+codeql::InitializerRefCallExpr ExprTranslator::translateConstructorRefCallExpr(
    const swift::ConstructorRefCallExpr& expr) {
  auto entry = createExprEntry(expr);
  fillSelfApplyExpr(expr, entry);
@@ -313,16 +313,16 @@ codeql::DiscardAssignmentExpr ExprTranslator::translateDiscardAssignmentExpr(
  return entry;
 }

-codeql::ClosureExpr ExprTranslator::translateClosureExpr(const swift::ClosureExpr& expr) {
+codeql::ExplicitClosureExpr ExprTranslator::translateClosureExpr(const swift::ClosureExpr& expr) {
  auto entry = createExprEntry(expr);
-  fillAbstractClosureExpr(expr, entry);
+  fillClosureExpr(expr, entry);
  return entry;
 }

 codeql::AutoClosureExpr ExprTranslator::translateAutoClosureExpr(
    const swift::AutoClosureExpr& expr) {
  auto entry = createExprEntry(expr);
-  fillAbstractClosureExpr(expr, entry);
+  fillClosureExpr(expr, entry);
  return entry;
 }

@@ -393,7 +393,7 @@ codeql::KeyPathExpr ExprTranslator::translateKeyPathExpr(const swift::KeyPathExp
  return entry;
 }

-codeql::LazyInitializerExpr ExprTranslator::translateLazyInitializerExpr(
+codeql::LazyInitializationExpr ExprTranslator::translateLazyInitializerExpr(
    const swift::LazyInitializerExpr& expr) {
  auto entry = createExprEntry(expr);
  entry.sub_expr = dispatcher.fetchLabel(expr.getSubExpr());
@@ -427,10 +427,10 @@ codeql::KeyPathApplicationExpr ExprTranslator::translateKeyPathApplicationExpr(
  return entry;
 }

-codeql::OtherConstructorDeclRefExpr ExprTranslator::translateOtherConstructorDeclRefExpr(
+codeql::OtherInitializerRefExpr ExprTranslator::translateOtherConstructorDeclRefExpr(
    const swift::OtherConstructorDeclRefExpr& expr) {
  auto entry = createExprEntry(expr);
-  entry.constructor_decl = dispatcher.fetchLabel(expr.getDecl());
+  entry.initializer = dispatcher.fetchLabel(expr.getDecl());
  return entry;
 }

@@ -472,8 +472,8 @@ codeql::ErrorExpr ExprTranslator::translateErrorExpr(const swift::ErrorExpr& exp
  return entry;
 }

-void ExprTranslator::fillAbstractClosureExpr(const swift::AbstractClosureExpr& expr,
-                                             codeql::AbstractClosureExpr& entry) {
+void ExprTranslator::fillClosureExpr(const swift::AbstractClosureExpr& expr,
+                                     codeql::ClosureExpr& entry) {
  assert(expr.getParameters() && "AbstractClosureExpr has getParameters()");
  entry.params = dispatcher.fetchRepeatedLabels(*expr.getParameters());
  entry.body = dispatcher.fetchLabel(expr.getBody());
--- a/swift/extractor/translators/ExprTranslator.h
+++ b/swift/extractor/translators/ExprTranslator.h
@@ -39,7 +39,7 @@ class ExprTranslator : public AstTranslatorBase<ExprTranslator> {
  codeql::OpenExistentialExpr translateOpenExistentialExpr(const swift::OpenExistentialExpr& expr);
  codeql::OptionalEvaluationExpr translateOptionalEvaluationExpr(
      const swift::OptionalEvaluationExpr& expr);
-  codeql::RebindSelfInConstructorExpr translateRebindSelfInConstructorExpr(
+  codeql::RebindSelfInInitializerExpr translateRebindSelfInConstructorExpr(
      const swift::RebindSelfInConstructorExpr& expr);
  codeql::SuperRefExpr translateSuperRefExpr(const swift::SuperRefExpr& expr);
  codeql::DotSyntaxCallExpr translateDotSyntaxCallExpr(const swift::DotSyntaxCallExpr& expr);
@@ -69,11 +69,11 @@ class ExprTranslator : public AstTranslatorBase<ExprTranslator> {
  codeql::TryExpr translateTryExpr(const swift::TryExpr& expr);
  codeql::ForceTryExpr translateForceTryExpr(const swift::ForceTryExpr& expr);
  codeql::OptionalTryExpr translateOptionalTryExpr(const swift::OptionalTryExpr& expr);
-  codeql::ConstructorRefCallExpr translateConstructorRefCallExpr(
+  codeql::InitializerRefCallExpr translateConstructorRefCallExpr(
      const swift::ConstructorRefCallExpr& expr);
  codeql::DiscardAssignmentExpr translateDiscardAssignmentExpr(
      const swift::DiscardAssignmentExpr& expr);
-  codeql::ClosureExpr translateClosureExpr(const swift::ClosureExpr& expr);
+  codeql::ExplicitClosureExpr translateClosureExpr(const swift::ClosureExpr& expr);
  codeql::AutoClosureExpr translateAutoClosureExpr(const swift::AutoClosureExpr& expr);
  codeql::CoerceExpr translateCoerceExpr(const swift::CoerceExpr& expr);
  codeql::ConditionalCheckedCastExpr translateConditionalCheckedCastExpr(
@@ -85,13 +85,14 @@ class ExprTranslator : public AstTranslatorBase<ExprTranslator> {
  codeql::DictionaryExpr translateDictionaryExpr(const swift::DictionaryExpr& expr);
  codeql::MemberRefExpr translateMemberRefExpr(const swift::MemberRefExpr& expr);
  codeql::KeyPathExpr translateKeyPathExpr(const swift::KeyPathExpr& expr);
-  codeql::LazyInitializerExpr translateLazyInitializerExpr(const swift::LazyInitializerExpr& expr);
+  codeql::LazyInitializationExpr translateLazyInitializerExpr(
+      const swift::LazyInitializerExpr& expr);
  codeql::ForceValueExpr translateForceValueExpr(const swift::ForceValueExpr& expr);
  codeql::IfExpr translateIfExpr(const swift::IfExpr& expr);
  codeql::KeyPathDotExpr translateKeyPathDotExpr(const swift::KeyPathDotExpr& expr);
  codeql::KeyPathApplicationExpr translateKeyPathApplicationExpr(
      const swift::KeyPathApplicationExpr& expr);
-  codeql::OtherConstructorDeclRefExpr translateOtherConstructorDeclRefExpr(
+  codeql::OtherInitializerRefExpr translateOtherConstructorDeclRefExpr(
      const swift::OtherConstructorDeclRefExpr& expr);
  codeql::UnresolvedDeclRefExpr translateUnresolvedDeclRefExpr(
      const swift::UnresolvedDeclRefExpr& expr);
@@ -118,8 +119,7 @@ class ExprTranslator : public AstTranslatorBase<ExprTranslator> {
  codeql::RegexLiteralExpr translateRegexLiteralExpr(const swift::RegexLiteralExpr& expr);

 private:
-  void fillAbstractClosureExpr(const swift::AbstractClosureExpr& expr,
-                               codeql::AbstractClosureExpr& entry);
+  void fillClosureExpr(const swift::AbstractClosureExpr& expr, codeql::ClosureExpr& entry);
  TrapLabel<ArgumentTag> emitArgument(const swift::Argument& arg);
  TrapLabel<KeyPathComponentTag> emitKeyPathComponent(const swift::KeyPathExpr::Component& expr);
  void fillExplicitCastExpr(const swift::ExplicitCastExpr& expr, codeql::ExplicitCastExpr& entry);
--- a/swift/integration-tests/posix-only/cross-references/Deinitializers.expected
+++ b/swift/integration-tests/posix-only/cross-references/Deinitializers.expected
--- a/swift/integration-tests/posix-only/cross-references/Deinitializers.ql
+++ b/swift/integration-tests/posix-only/cross-references/Deinitializers.ql
@@ -1,5 +1,5 @@
 import swift

-from DestructorDecl d
+from Deinitializer d
 where d.getLocation().getFile().getBaseName() != "Package.swift"
 select d
--- a/swift/integration-tests/posix-only/cross-references/Functions.ql
+++ b/swift/integration-tests/posix-only/cross-references/Functions.ql
@@ -1,5 +1,5 @@
-import swift
+import codeql.swift.elements.decl.AccessorOrNamedFunction

-from FuncDecl f
+from AccessorOrNamedFunction f
 where f.getLocation().getFile().getBaseName() != "Package.swift"
 select f
--- a/swift/integration-tests/posix-only/cross-references/Initializers.expected
+++ b/swift/integration-tests/posix-only/cross-references/Initializers.expected
--- a/swift/integration-tests/posix-only/cross-references/Initializers.ql
+++ b/swift/integration-tests/posix-only/cross-references/Initializers.ql
@@ -1,5 +1,5 @@
 import swift

-from ConstructorDecl d
+from Initializer d
 where d.getLocation().getFile().getBaseName() != "Package.swift"
 select d
--- a/swift/integration-tests/posix-only/deduplication/Decls.expected
+++ b/swift/integration-tests/posix-only/deduplication/Decls.expected
@@ -1,12 +1,12 @@
 | Sources/deduplication/def.swift:1:1:1:9 | var ... = ... | PatternBindingDecl |
 | Sources/deduplication/def.swift:1:5:1:5 | x | ConcreteVarDecl |
 | Sources/deduplication/def.swift:3:1:3:20 | Generic | StructDecl |
-| Sources/deduplication/def.swift:3:8:3:8 | Generic<T>.init() | ConstructorDecl |
+| Sources/deduplication/def.swift:3:8:3:8 | Generic<T>.init() | Initializer |
 | Sources/deduplication/def.swift:3:8:3:8 | self | ParamDecl |
 | Sources/deduplication/def.swift:3:16:3:16 | T | GenericTypeParamDecl |
 | Sources/deduplication/def.swift:5:1:5:41 | var ... = ... | PatternBindingDecl |
 | Sources/deduplication/def.swift:5:5:5:5 | instantiated_generic | ConcreteVarDecl |
-| Sources/deduplication/def.swift:7:1:7:42 | function(_:) | ConcreteFuncDecl |
+| Sources/deduplication/def.swift:7:1:7:42 | function(_:) | NamedFunction |
 | Sources/deduplication/def.swift:7:15:7:18 | _ | ParamDecl |
 | Sources/deduplication/use.swift:1:1:1:13 | var ... = ... | PatternBindingDecl |
 | Sources/deduplication/use.swift:1:5:1:5 | use_x | ConcreteVarDecl |
--- a/swift/integration-tests/posix-only/hello-world/Bodies.ql
+++ b/swift/integration-tests/posix-only/hello-world/Bodies.ql
@@ -1,5 +1,5 @@
 import swift

-from StructDecl struct, ConstructorDecl decl, BraceStmt body
+from StructDecl struct, Initializer decl, BraceStmt body
 where struct.getName() = "hello_world" and decl = struct.getAMember() and body = decl.getBody()
 select decl, body
--- a/swift/integration-tests/posix-only/linkage-awareness/Bodies.ql
+++ b/swift/integration-tests/posix-only/linkage-awareness/Bodies.ql
@@ -1,5 +1,5 @@
 import swift

-from ConcreteFuncDecl decl, BraceStmt body
+from NamedFunction decl, BraceStmt body
 where decl.getName() = "foo()" and decl.getBody() = body
 select decl, body
--- a/swift/ql/.generated.list
+++ b/swift/ql/.generated.list
@@ -13,24 +13,21 @@ ql/lib/codeql/swift/elements/PlatformVersionAvailabilitySpecConstructor.qll ce9c
 ql/lib/codeql/swift/elements/UnspecifiedElementConstructor.qll 0d179f8189f6268916f88c78a2665f8d4e78dc71e71b6229354677e915ac505d e8f5c313b7d8b0e93cee84151a5f080013d2ca502f3facbbde4cdb0889bc7f8e
 ql/lib/codeql/swift/elements/decl/AbstractStorageDecl.qll 5cfb9920263784224359ebd60a67ec0b46a7ea60d550d782eb1283d968386a66 74a74330a953d16ce1cc19b2dbabdf8c8ff0fc3d250d101b8108a6597844e179
 ql/lib/codeql/swift/elements/decl/AbstractTypeParamDecl.qll 1847039787c20c187f2df25ea15d645d7225e1f1fd2ca543f19927fe3161fd09 737ad9c857c079605e84dc7ebaecbafa86fe129283756b98e6e574ac9e24c22c
-ql/lib/codeql/swift/elements/decl/AccessorDeclConstructor.qll 08376434fd14a2b07280e931d3e22d3eafd2063d745f7c78cad0f9fd7e6156ba 6f74d15a88433953998a07eb2131841679a88cb13efb0569ed9b5502c4a2e362
+ql/lib/codeql/swift/elements/decl/AccessorConstructor.qll 1f71e110357f3e0657b4fcad27b3d1cc1f0c4615112574329f6ab1a972f9a460 61e4eacf9a909a2b6c3934f273819ae57434456dc8e83692c89d3f89ffc1fea7
+ql/lib/codeql/swift/elements/decl/AccessorOrNamedFunction.qll fa59f6554532ef41ab90144c4f02d52e473192f5e902086f28189c148f149af4 8995cc4994c78a2e13ab3aa5fb03ca80edb96a41049ad714ebb9508a5245d179
 ql/lib/codeql/swift/elements/decl/AssociatedTypeDecl.qll 2f6f634fe6e3b69f1925aff0d216680962a3aaa3205bf3a89e2b66394be48f8e e81dc740623b4e2c75f83104acaa3d2b6cc6d001dd36a8520c381e0de10e15c4
 ql/lib/codeql/swift/elements/decl/AssociatedTypeDeclConstructor.qll ec9007ea072ff22c367f40da69db2f0a8463bb411bbfd33e2d6c8b489a496027 631f688a8410ddcfbaa575fa2f8ffcdbc1b51ee37639b337c804ca1d5af56e0c
 ql/lib/codeql/swift/elements/decl/CapturedDeclConstructor.qll 4a33802b047de8d52778c262329f17b88de79c2b3162ebfa3d2b1d40dbf97041 0ed1c94469236252cf81e014138a6b2e6478e3b194512ba36e2a43e03e46cc4a
 ql/lib/codeql/swift/elements/decl/ClassDecl.qll 40dd7d0d66217023c8f5695eac862b38428d8f2431635f62a65b336c3cc0e9bb ac681bdc1770a823ea529456f32b1da7b389621254ccd9102e6a49136c53854b
 ql/lib/codeql/swift/elements/decl/ClassDeclConstructor.qll 0092ab4b76cd858489d76be94a43442c0e5f395b1d5684309674957e107979b7 9bc496e483feb88552ca0d48e32039aa4566f4612fc27073fea48ad954985d46
-ql/lib/codeql/swift/elements/decl/ConcreteFuncDecl.qll 43f54876f39f58beb1d0b8293976648d1e4f5585046a502835eb7befb278f6b0 3a07a73dc11ef06ddaeb3d401748ef14a1ee66447c86d2e8c8f187dda92b34a2
-ql/lib/codeql/swift/elements/decl/ConcreteFuncDeclConstructor.qll 4eb2e9dc8b4c93e457bb594085d8f50862dc07a712ce7a0f2dee7f108467ce3e 1f994d6ae1ca2e4fd5da075b70ea22322181bdaf43034face1e82ef353fe34bf
 ql/lib/codeql/swift/elements/decl/ConcreteVarDecl.qll 94bcbdd91f461295c5b6b49fa597b7e3384556c2383ad0c2a7c58276bade79e6 d821efa43c6d83aedfb959500de42c5ecabbf856f8556f739bc6cec30a88dfab
 ql/lib/codeql/swift/elements/decl/ConcreteVarDeclConstructor.qll 4b6a9f458db5437f9351b14464b3809a78194029554ea818b3e18272c17afba3 a60d695b0d0ffa917ad01908bec2beaa663e644eddb00fb370fbc906623775d4
-ql/lib/codeql/swift/elements/decl/ConstructorDeclConstructor.qll ba5cc6f440cba3d47b364a37febd64f85941cdc0237db52a2b8844d1dc75d483 9fc039ca7a0f33f03b3f573186f02efecbac0c2e0dc5abba5d47876ca26390fe
-ql/lib/codeql/swift/elements/decl/DestructorDeclConstructor.qll c33b113a3ccb0b1bfd9aad8b909940776da5fdb8a24e1b998c5ebde3903be981 155ad928fbebf9688eec30a2cf61d9a2d4cd15d1161dc3f6202e6331bdb3a56a
+ql/lib/codeql/swift/elements/decl/DeinitializerConstructor.qll 85f29a68ee5c0f2606c51e7a859f5f45fbc5f373e11b5e9c0762c9ba5cff51c4 6b28f69b8125d0393607dbad8e7a8aaa6469b9c671f67e8e825cc63964ed2f5d
 ql/lib/codeql/swift/elements/decl/EnumCaseDeclConstructor.qll 8c907544170671f713a8665d294eeefdbe78a607c2f16e2c630ea9c33f484baf eec83efc930683628185dbdad8f73311aad510074d168a53d85ea09d13f1f7e1
 ql/lib/codeql/swift/elements/decl/EnumDecl.qll 29f9d8cbfb19c174af9a666162fd918af7f962fa5d97756105e78d5eec38cb9e 779940ebdbd510eb651972c57eb84b04af39c44ef59a8c307a44549ab730febb
 ql/lib/codeql/swift/elements/decl/EnumDeclConstructor.qll 642bbfb71e917d84695622f3b2c7b36bf5be4e185358609810267ab1fc4e221b f6e06d79e7ff65fbabf72c553508b67406fb59c577215d28cc47971d34b6af05
 ql/lib/codeql/swift/elements/decl/EnumElementDeclConstructor.qll 736074246a795c14a30a8ec7bb8da595a729983187887294e485487309919dc6 4614fb380fad7af1b5fb8afce920f3e7350378254ece60d19722046046672fbb
 ql/lib/codeql/swift/elements/decl/ExtensionDeclConstructor.qll 4f811e3332720327d2b9019edbb2fa70fb24322e72881afc040e7927452409d6 554f9832311dfc30762507e0bd4b25c5b6fdb9d0c4e8252cc5a1ef1033fafacb
-ql/lib/codeql/swift/elements/decl/FuncDecl.qll d3ff8bfb16c54b4d82bc2a0b9fe400bb511376d008eb0180859e7b6ad5c32b4a ba8e48682e93af0804e66f5bf0207049e291a0c1430a872252dc67af17ea700a
 ql/lib/codeql/swift/elements/decl/GenericContext.qll de30cdd5cdf05024dfd25dbe3be91607bd871b03a0d97c9d7c21430d7d5bb325 4747af5faf0a93d7508e0ec58021a842ca5ec41831b5d71cbc7fce2a2389a820
 ql/lib/codeql/swift/elements/decl/GenericTypeDecl.qll ace55c6a6cea01df01a9270c38b0d9867dee1b733bca1d1b23070fc2fe1307a5 42e1e3e055f3e5fa70c8624910d635ab10fe4015d378be9e1e6e1adb39f0dc40
 ql/lib/codeql/swift/elements/decl/GenericTypeParamDecl.qll 8d8c148342b4d77ecb9a849b7172708139509aca19f744b0badf422c07b6d47a 569a380917adf4e26b286343c654954d472eabf3fe91e0d1b5f26549d9c6d24e
@@ -39,9 +36,12 @@ ql/lib/codeql/swift/elements/decl/IfConfigDeclConstructor.qll ebd945f0a081421bd7
 ql/lib/codeql/swift/elements/decl/ImportDeclConstructor.qll f2f09df91784d7a6d348d67eaf3429780ac820d2d3a08f66e1922ea1d4c8c60d 4496865a26be2857a335cbc00b112beb78a319ff891d0c5d2ad41a4d299f0457
 ql/lib/codeql/swift/elements/decl/InfixOperatorDecl.qll 58ba4d318b958d73e2446c6c8a839deb041ac965c22fbc218e5107c0f00763f8 5dec87f0c43948f38e942b204583043eb4f7386caa80cec8bf2857a2fd933ed4
 ql/lib/codeql/swift/elements/decl/InfixOperatorDeclConstructor.qll ca6c5c477e35e2d6c45f8e7a08577c43e151d3e16085f1eae5c0a69081714b04 73543543dff1f9847f3299091979fdf3d105a84e2bcdb890ce5d72ea18bba6c8
+ql/lib/codeql/swift/elements/decl/InitializerConstructor.qll 6211d28a26085decb264a9f938523e6bb0be28b292705587042ca711f9c24ef8 23ac17f8c41e2864c9f6ae8ebd070332b4b8cd3845c6b70b55becab13994c446
 ql/lib/codeql/swift/elements/decl/MissingMemberDeclConstructor.qll 82738836fa49447262e184d781df955429c5e3697d39bf3689397d828f04ce65 8ef82ed7c4f641dc8b4d71cd83944582da539c34fb3d946c2377883abada8578
 ql/lib/codeql/swift/elements/decl/ModuleDecl.qll a6d2f27dc70a76ec8f3360322cde3961871222c8621d99fec3a3ac5762967687 410311bf3ae1efac53d8fd6515c2fe69d9ab79902c1048780e87d478cd200e26
 ql/lib/codeql/swift/elements/decl/ModuleDeclConstructor.qll 9b18b6d3517fd0c524ac051fd5dea288e8f923ada00fe4cc809cbebce036f890 0efc90492417089b0982a9a6d60310faba7a1fce5c1749396e3a29b3aac75dc5
+ql/lib/codeql/swift/elements/decl/NamedFunction.qll cc1c257510d5698c219aa3b6715f9d638eb2f3d9bd77d83754b0a7982aa06902 c697db806e9f0fdfaf5699107f322bd1b5d379f80d046e6bef18b10be3be73c2
+ql/lib/codeql/swift/elements/decl/NamedFunctionConstructor.qll 4a2e34be5e3b18f67c9a84d07d3ba8b5e5130c752548ea50ac5307168efea249 0f1e1e49abd10fb9f4391ad0676bd34ab5c2c24a6e7be6b3293a4459783b28a1
 ql/lib/codeql/swift/elements/decl/OpaqueTypeDecl.qll 06e94ab2b5cebfc72a390dc420bb4c122d66e80de6d90a6bf77b230aab355f6e e84e0dd1a3175ad29123def00e71efbd6f4526a12601fc027b0892930602046b
 ql/lib/codeql/swift/elements/decl/OpaqueTypeDeclConstructor.qll f707aab3627801e94c63aedcded21eab14d3617c35da5cf317692eeb39c84710 20888ae6e386ae31e3cb9ff78155cb408e781ef1e7b6d687c2705843bcac0340
 ql/lib/codeql/swift/elements/decl/ParamDeclConstructor.qll cfa0ba73a9727b8222efbf65845d6df0d01800646feaf7b407b8ffe21a6691d8 916ff2d3e96546eac6828e1b151d4b045ce5f7bcd5d7dbb074f82ecf126b0e09
@@ -62,7 +62,6 @@ ql/lib/codeql/swift/elements/decl/TypeAliasDecl.qll 984c5802c35e595388f7652cef1a
 ql/lib/codeql/swift/elements/decl/TypeAliasDeclConstructor.qll ba70bb69b3a14283def254cc1859c29963838f624b3f1062a200a8df38f1edd5 96ac51d1b3156d4139e583f7f803e9eb95fe25cc61c12986e1b2972a781f9c8b
 ql/lib/codeql/swift/elements/expr/AbiSafeConversionExpr.qll 39b856c89b8aff769b75051fd9e319f2d064c602733eaa6fed90d8f626516306 a87738539276438cef63145461adf25309d1938cfac367f53f53d33db9b12844
 ql/lib/codeql/swift/elements/expr/AbiSafeConversionExprConstructor.qll 7d70e7c47a9919efcb1ebcbf70e69cab1be30dd006297b75f6d72b25ae75502a e7a741c42401963f0c1da414b3ae779adeba091e9b8f56c9abf2a686e3a04d52
-ql/lib/codeql/swift/elements/expr/AbstractClosureExpr.qll 4027b51a171387332f96cb7b78ca87a6906aec76419938157ac24a60cff16519 400790fe643585ad39f40c433eff8934bbe542d140b81341bca3b6dfc5b22861
 ql/lib/codeql/swift/elements/expr/AnyHashableErasureExpr.qll d6193ef0ba97877dfbdb3ea1c18e27dad5b5d0596b4b5b12416b31cbe1b3d1d6 bf80cab3e9ff5366a6223153409f4852acdb9e4a5d464fb73b2a8cffc664ca29
 ql/lib/codeql/swift/elements/expr/AnyHashableErasureExprConstructor.qll 12816f18d079477176519a20b0f1262fc84da98f60bce3d3dd6476098c6542e7 4cc5c8492a97f4639e7d857f2fca9065293dfa953d6af451206ce911cda9f323
 ql/lib/codeql/swift/elements/expr/AnyTryExpr.qll 4a56bb49ed1d9f3c81c1c6cce3c60657e389facd87807eaefa407532259cec70 988b5df28972e877486704a43698ada91e68fe875efc331f0d7139c78b36f7dd
@@ -90,7 +89,6 @@ ql/lib/codeql/swift/elements/expr/CaptureListExprConstructor.qll 03af12d1b10bdc2
 ql/lib/codeql/swift/elements/expr/CheckedCastExpr.qll 440eeee832401584f46779389d93c2a4faa93f06bd5ea00a6f2049040ae53847 e7c90a92829472335199fd7a8e4ba7b781fbbf7d18cf12d6c421ddb22c719a4b
 ql/lib/codeql/swift/elements/expr/ClassMetatypeToObjectExpr.qll 9830ef94d196c93e016237c330a21a9d935d49c3d0493e597c3e29804940b29e 4b5aca9fa4524dc25dc6d12eb32eeda179a7e7ec20f4504493cf7eb828a8e7be
 ql/lib/codeql/swift/elements/expr/ClassMetatypeToObjectExprConstructor.qll 369cecb4859164413d997ee4afba444853b77fb857fa2d82589603d88d01e1dc 3b4ebd1fb2e426cba21edd91b36e14dc3963a1ede8c482cdf04ef5003a290b28
-ql/lib/codeql/swift/elements/expr/ClosureExprConstructor.qll cf2fa2dab328f6b98aeffcdc833de4d74f69d23779ac897f5ada9c2dca9ef093 13f85b735ebb56c361458baba45eb854e70b7987d5e1863e564084c1a6165cc5
 ql/lib/codeql/swift/elements/expr/CoerceExpr.qll e68c125466a36af148f0e47ff1d22b13e9806a40f1ec5ddc540d020d2ab7c7dc eb13ef05c7436d039c1f8a4164b039bdbf12323310c249d7702291058f244d38
 ql/lib/codeql/swift/elements/expr/CoerceExprConstructor.qll aa80ea0e6c904fab461c463137ce1e755089c3990f789fae6a0b29dea7013f6d 455f5184a3d2e2a6b9720a191f1f568699f598984779d923c2b28e8a3718fa9d
 ql/lib/codeql/swift/elements/expr/CollectionExpr.qll ec0e46338e028821afe1bafb2bed4edc9c9a9f69b65b397c3c0914eb52851bb0 87977b7661bcd8212b07b36f45ff94f5e98513c6dddb4cca697d1d6b853dff72
@@ -100,7 +98,6 @@ ql/lib/codeql/swift/elements/expr/ConditionalBridgeFromObjCExpr.qll 4ff4d0e9f4af
 ql/lib/codeql/swift/elements/expr/ConditionalBridgeFromObjCExprConstructor.qll 7350d9e279995181f08dcc931723d21a36aac17b3ea5b633c82bac5c7aeb733a dc6767f621bddcc22be8594b46b7d3170e5d7bfcee6f1e0279c26492fd88c81d
 ql/lib/codeql/swift/elements/expr/ConditionalCheckedCastExpr.qll 3052583ee44e9c859dddefc2ee578710c7ac272ba82eb939e2299008da0c92db a66a1e07b210a1e8d999380db04a8b3210b66049a876bd92c8f56eae66c5a062
 ql/lib/codeql/swift/elements/expr/ConditionalCheckedCastExprConstructor.qll 13a1032bfa1199245746d4aac2c54d3ba336d3580c2713a66a91ad47eb8648ca 2a7c66669551aaa3528d77a8525985b850acbc983fea6f076561709a076dadb7
-ql/lib/codeql/swift/elements/expr/ConstructorRefCallExpr.qll 2d8709f776df9edda8f1c07884fc32d1d25306cc2e8029d7b0c74d91f3828fef fc4b855b27f7afefab8132bd2adc3567cceec6b2fd762bf1dc7463ce76421326
 ql/lib/codeql/swift/elements/expr/CovariantFunctionConversionExpr.qll 0d18efcc60908890fa4ebf3ef90b19b06a4140d06ec90053ab33db3ad864281a 4510d77d211f4b6db9dd4c941706d7eb7579fe7311714758c9d1d24513bfbdc4
 ql/lib/codeql/swift/elements/expr/CovariantFunctionConversionExprConstructor.qll eac12524819e9fe29074f90ea89fea866023b5ed4a5494345f2b9d8eec531620 71a6eb320630f42403e1e67bb37c39a1bae1c9f6cc38c0f1688a31f3f206d83f
 ql/lib/codeql/swift/elements/expr/CovariantReturnConversionExpr.qll baa7e9a3c2a2de383d55fac1741b8739c389b9c3cf7a0241d357d226364daaf3 720fb172ebcb800c70810539c7a80dbdf61acb970277f2b6a54b9159ab4e016e
@@ -130,6 +127,8 @@ ql/lib/codeql/swift/elements/expr/ErrorExpr.qll 8a68131297e574625a22fbbb28f3f090
 ql/lib/codeql/swift/elements/expr/ErrorExprConstructor.qll dd2bec0e35121e0a65d47600100834963a7695c268e3832aad513e70b1b92a75 e85dcf686403511c5f72b25ae9cf62f77703575137c39610e61562efc988bbac
 ql/lib/codeql/swift/elements/expr/ExistentialMetatypeToObjectExpr.qll 420d534f76e192e89f29c71a7282e0697d259c00a7edc3e168ca895b0dc4f1d1 c0b5811c8665f3324b04d40f5952a62e631ec4b3f00db8e9cc13cb5d60028178
 ql/lib/codeql/swift/elements/expr/ExistentialMetatypeToObjectExprConstructor.qll 1a735425a59f8a2bd208a845e3b4fc961632c82db3b69d0b71a1bc2875090f3b 769b6a80a451c64cbf9ce09729b34493a59330d4ef54ab0d51d8ff81305b680f
+ql/lib/codeql/swift/elements/expr/ExplicitClosureExpr.qll 77626fd66735b1954e6ec80a50a36ce94dd725110a5051ab4034600c8ce5ca6f 4e169380503b98d00efd9f38e549621c21971ed9e92dbce601fb46df2f44de78
+ql/lib/codeql/swift/elements/expr/ExplicitClosureExprConstructor.qll 171d9f028bfb80754ddc917d0f6a24185d30643c6c2c80a8a5681dba16a4c48e 0e560df706726c7d45ea95532a9e4df00c03e860b840179f973bab8009c437ab
 ql/lib/codeql/swift/elements/expr/FloatLiteralExprConstructor.qll 4dfb34d32e4022b55caadcfbe147e94ebe771395c59f137228213a51a744ba10 1eb78fcda9e0b70d1993e02408fb6032035991bf937c4267149ab9c7c6a99d3a
 ql/lib/codeql/swift/elements/expr/ForceTryExprConstructor.qll 48cbc408bb34a50558d25aa092188e1ad0f68d83e98836e05072037f3d8b49af 62ce7b92410bf712ecd49d3eb7dd9b195b9157415713aaf59712542339f37e4c
 ql/lib/codeql/swift/elements/expr/ForceValueExprConstructor.qll 3b201ee2d70ab13ad7e3c52aad6f210385466ec4a60d03867808b4d3d97511a8 d5d9f0e7e7b4cae52f97e4681960fa36a0c59b47164868a4a099754f133e25af
@@ -143,6 +142,7 @@ ql/lib/codeql/swift/elements/expr/IfExprConstructor.qll 19450ccaa41321db4114c275
 ql/lib/codeql/swift/elements/expr/InOutExprConstructor.qll c8c230f9a396acadca6df83aed6751ec1710a51575f85546c2664e5244b6c395 2e354aca8430185889e091ddaecd7d7df54da10706fe7fe11b4fa0ee04d892e0
 ql/lib/codeql/swift/elements/expr/InOutToPointerExpr.qll 145616d30d299245701f15417d02e6e90a6aa61b33326bfd4bc2a2d69bed5551 e9c7db3671cce65c775760c52d1e58e91903ad7be656457f096bfe2abab63d29
 ql/lib/codeql/swift/elements/expr/InOutToPointerExprConstructor.qll 06b1377d3d7399ef308ba3c7787192446452a4c2e80e4bb9e235267b765ae05d 969680fddeb48d9e97c05061ae9cbc56263e4c5ad7f4fad5ff34fdaa6c0010b4
+ql/lib/codeql/swift/elements/expr/InitializerRefCallExpr.qll 9df0739f61bab51895c51acdc9d5889693c4466a522fcd05d402ad7c9436682e 1695a0e6f88bd59de32d75d4cb2bd41ffc97a42818ef2ed10fe785aa87bfb28f
 ql/lib/codeql/swift/elements/expr/InjectIntoOptionalExpr.qll 79d859152f5fde76e28b8b01e3ba70ec481650b39e2a686fc6898759948bc716 6ec93a725c92a9abf62c39451eaf6435942b61b56bd06db0d494da0b5f407441
 ql/lib/codeql/swift/elements/expr/InjectIntoOptionalExprConstructor.qll e25cee8b12b0640bfcc652973bbe677c93b4cb252feba46f9ffe3d822f9d97e0 4211336657fce1789dcdc97d9fe75e6bc5ab3e79ec9999733488e0be0ae52ca2
 ql/lib/codeql/swift/elements/expr/IntegerLiteralExprConstructor.qll 779c97ef157265fa4e02dacc6ece40834d78e061a273d30773ac2a444cf099d0 d57c9e8bbb04d8c852906a099dc319473ae126b55145735b0c2dc2b671e1bcbd
@@ -151,7 +151,7 @@ ql/lib/codeql/swift/elements/expr/IsExprConstructor.qll 0dc758a178c448c453fb3902
 ql/lib/codeql/swift/elements/expr/KeyPathApplicationExprConstructor.qll c58c6812821d81dfb724fd37f17b2d80512c0584cf79e58ebb3a9657199e8f91 a4b9d8369f0224f9878bf20fcad4047756e26592fb7848988bdb96e463236440
 ql/lib/codeql/swift/elements/expr/KeyPathDotExprConstructor.qll d112a3a1c1b421fc6901933685179232ac37134270482a5b18d96ba6f78a1fd1 abce0b957bdf2c4b7316f4041491d31735b6c893a38fbf8d96e700a377617b51
 ql/lib/codeql/swift/elements/expr/KeyPathExprConstructor.qll 96f7bc80a1364b95f5a02526b3da4f937abe6d8672e2a324d57c1b036389e102 2f65b63e8eac280b338db29875f620751c8eb14fbdcf6864d852f332c9951dd7
-ql/lib/codeql/swift/elements/expr/LazyInitializerExprConstructor.qll deba52e51f31504564adc33da079b70f1f2da1e3e6f9538cba8bf97be0c27c64 4499c688d86c08cb33a754ad86f6adbe47754aa0fc58a4d77dd7cbfa1ca1fa50
+ql/lib/codeql/swift/elements/expr/LazyInitializationExprConstructor.qll 4f81a962f7406230323f422546bba2176ac20aef75a67cab62e11612946b2176 5ed2b68fd3667688dca83f1db89ebdb01c0f6f67b50b824a03940aeb41b834a3
 ql/lib/codeql/swift/elements/expr/LinearFunctionExpr.qll 37fc05646e4fbce7332fb544e3c1d053a2f2b42acb8ce1f3a9bb19425f74ae34 b3253571f09a743a235c0d27384e72cf66b26ba8aa5e34061956c63be4940f15
 ql/lib/codeql/swift/elements/expr/LinearFunctionExprConstructor.qll 18998356c31c95a9a706a62dd2db24b3751015878c354dc36aa4655e386f53c3 7e02b4801e624c50d880c2826ef7149ad609aa896d194d64f715c16cfbd11a7d
 ql/lib/codeql/swift/elements/expr/LinearFunctionExtractOriginalExpr.qll c968bca2c79985d8899e37a4015de2a6df6fd40f6e519f8f0601202c32c68f70 bd9f3c1a5114cec5c360a1bb94fe2ffaa8559dfdd69d78bd1a1c039b9d0cab10
@@ -179,7 +179,7 @@ ql/lib/codeql/swift/elements/expr/OpenExistentialExprConstructor.qll c56e5e6f7ae
 ql/lib/codeql/swift/elements/expr/OptionalEvaluationExpr.qll bba59c32fbe7e76ddf07b8bbe68ce09587f490687e6754c2210e13bda055ba25 559902efedbf4c5ef24697267c7b48162129b4ab463b41d89bdfb8b94742fa9f
 ql/lib/codeql/swift/elements/expr/OptionalEvaluationExprConstructor.qll 4ba0af8f8b4b7920bc1106d069455eb754b7404d9a4bfc361d2ea22e8763f4fe 6d07e7838339290d1a2aec88addd511f01224d7e1d485b08ef4793e01f4b4421
 ql/lib/codeql/swift/elements/expr/OptionalTryExprConstructor.qll 60d2f88e2c6fc843353cc52ce1e1c9f7b80978750d0e780361f817b1b2fea895 4eabd9f03dc5c1f956e50e2a7af0535292484acc69692d7c7f771e213609fd04
-ql/lib/codeql/swift/elements/expr/OtherConstructorDeclRefExprConstructor.qll cf726ed7ed830e17aaedf1acddf1edc4efc7d72ab9f9580bc89cc8eefbd54d8a 4ef3010dc5500bd503db8aa531d5455a9c80bc30172fb005abc6459b6f66ea00
+ql/lib/codeql/swift/elements/expr/OtherInitializerRefExprConstructor.qll 6d0fdbcf2d8e321e576947345c1bdb49b96b3cc7689598e28c77aa79baf55d62 a7aa3163f0437975db0d0a8e3fe4224c05f0ad0a03348f7c6ec3edc37f90530c
 ql/lib/codeql/swift/elements/expr/OverloadedDeclRefExpr.qll 97e35eda07e243144652648342621a67745c0b3b324940777d38a4a293968cf6 47b1c6df5397de490f62e96edc0656b1f97c0be73c6b99ecd78b62d46106ce61
 ql/lib/codeql/swift/elements/expr/OverloadedDeclRefExprConstructor.qll 2cf79b483f942fbf8aaf9956429b92bf9536e212bb7f7940c2bc1d30e8e8dfd5 f4c16a90e3ab944dded491887779f960e3077f0a8823f17f50f82cf5b9803737
 ql/lib/codeql/swift/elements/expr/ParenExprConstructor.qll 6baaa592db57870f5ecd9be632bd3f653c44d72581efd41e8a837916e1590f9e 6f28988d04b2cb69ddcb63fba9ae3166b527803a61c250f97e48ff39a28379f6
@@ -191,7 +191,7 @@ ql/lib/codeql/swift/elements/expr/PropertyWrapperValuePlaceholderExpr.qll d4b6e3
 ql/lib/codeql/swift/elements/expr/PropertyWrapperValuePlaceholderExprConstructor.qll 874da84b8ac2fbf6f44e5343e09629225f9196f0f1f3584e6bc314e5d01d8593 e01fc8f9a1d1cddab7c249437c13f63e8dc93e7892409791728f82f1111ac924
 ql/lib/codeql/swift/elements/expr/ProtocolMetatypeToObjectExpr.qll b43455289de611ba68870298e89ad6f94b5edbac69d3a22b3a91046e95020913 1f342dead634daf2cd77dd32a1e59546e8c2c073e997108e17eb2c3c832b3070
 ql/lib/codeql/swift/elements/expr/ProtocolMetatypeToObjectExprConstructor.qll aaaf5fd2496e24b341345933a5c730bbfd4de31c5737e22269c3f6927f8ae733 bece45f59dc21e9deffc1632aae52c17cf41924f953afc31a1aa94149ecc1512
-ql/lib/codeql/swift/elements/expr/RebindSelfInConstructorExprConstructor.qll 434e00b6e5d3ccf356dabb4a7d6574966676c32d4c257ad3606d5b9e2b715524 637a16d0f5f504bad4a04bb85d6491a94738781d3282bc27363cceafb3023408
+ql/lib/codeql/swift/elements/expr/RebindSelfInInitializerExprConstructor.qll 7d0d0c89dc155276334778166bfdad5f664ffb886eab568c49eef04ad3e773f3 8f60626aec107516224c10ef3e03d683ce9d7eb7faa7607289c25afc4625ee15
 ql/lib/codeql/swift/elements/expr/RegexLiteralExprConstructor.qll 7bf1bdba26d38e8397a9a489d05042ea2057f06e35f2a664876dc0225e45892d dcc697170a9fc03b708f4a13391395e3986d60eb482639e3f5a3ba0984b72349
 ql/lib/codeql/swift/elements/expr/SelfApplyExpr.qll 986b3ff9833aac59facecea185517c006264c5011191b4c7f31317a20926467a f0349628f9ead822783e09e56e0721f939bfb7f59c8661e6155b5a7d113c26f3
 ql/lib/codeql/swift/elements/expr/SequenceExpr.qll 813360eff6a312e39c7b6c49928477679a3f32314badf3383bf6204690a280e4 3b2d06ac54746033a90319463243f2d0f17265c7f1573cbfedbdca3fb7063fd2
@@ -366,7 +366,7 @@ ql/lib/codeql/swift/elements/type/VariadicSequenceType.qll 325e4c4481e9ac07acdc6
 ql/lib/codeql/swift/elements/type/VariadicSequenceTypeConstructor.qll 0d1d2328a3b5e503a883e7e6d7efd0ca5e7f2633abead9e4c94a9f98ed3cb223 69bff81c1b9413949eacb9298d2efb718ea808e68364569a1090c9878c4af856
 ql/lib/codeql/swift/elements/type/WeakStorageType.qll 7c07739cfc1459f068f24fef74838428128054adf611504d22532e4a156073e7 9c968414d7cc8d672f3754bced5d4f83f43a6d7872d0d263d79ff60483e1f996
 ql/lib/codeql/swift/elements/type/WeakStorageTypeConstructor.qll d88b031ef44d6de14b3ddcff2eb47b53dbd11550c37250ff2edb42e5d21ec3e9 26d855c33492cf7a118e439f7baeed0e5425cfaf058b1dcc007eca7ed765c897
-ql/lib/codeql/swift/elements.qll d4d76166fa8eb793973aa1c6862e0a4f9f44ca5ac364b0832f6edf4fd201110b d4d76166fa8eb793973aa1c6862e0a4f9f44ca5ac364b0832f6edf4fd201110b
+ql/lib/codeql/swift/elements.qll 3df0060edd2b2030f4e4d7d5518afe0073d798474d9b1d6185d833bec63ca8bd 3df0060edd2b2030f4e4d7d5518afe0073d798474d9b1d6185d833bec63ca8bd
 ql/lib/codeql/swift/generated/AstNode.qll 02ca56d82801f942ae6265c6079d92ccafdf6b532f6bcebd98a04029ddf696e4 6216fda240e45bd4302fa0cf0f08f5f945418b144659264cdda84622b0420aa2
 ql/lib/codeql/swift/generated/AvailabilityInfo.qll 996a5cfadf7ca049122a1d1a1a9eb680d6a625ce28ede5504b172eabe7640fd2 4fe6e0325ff021a576fcd004730115ffaa60a2d9020420c7d4a1baa498067b60
 ql/lib/codeql/swift/generated/AvailabilitySpec.qll fb1255f91bb5e41ad4e9c675a2efbc50d0fb366ea2de68ab7eebd177b0795309 144e0c2e7d6c62ecee43325f7f26dcf437881edf0b75cc1bc898c6c4b61fdeaf
@@ -382,40 +382,40 @@ ql/lib/codeql/swift/generated/KeyPathComponent.qll f8d62b8021936dc152538b52278a3
 ql/lib/codeql/swift/generated/Locatable.qll bdc98b9fb7788f44a4bf7e487ee5bd329473409950a8e9f116d61995615ad849 0b36b4fe45e2aa195e4bb70c50ea95f32f141b8e01e5f23466c6427dd9ab88fb
 ql/lib/codeql/swift/generated/Location.qll 851766e474cdfdfa67da42e0031fc42dd60196ff5edd39d82f08d3e32deb84c1 b29b2c37672f5acff15f1d3c5727d902f193e51122327b31bd27ec5f877bca3b
 ql/lib/codeql/swift/generated/OtherAvailabilitySpec.qll 0e26a203b26ff0581b7396b0c6d1606feec5cc32477f676585cdec4911af91c5 0e26a203b26ff0581b7396b0c6d1606feec5cc32477f676585cdec4911af91c5
-ql/lib/codeql/swift/generated/ParentChild.qll 3998d73048297cf2df42176b0060c025e57d409d56f3fbfab9c202bd46c07b5e 425b01328baf38bd5e46403e11b25b0e17cd5bc40731dbf64a46e01604611e15
+ql/lib/codeql/swift/generated/ParentChild.qll 7db14da89a0dc22ab41e654750f59d03085de8726ac358c458fccb0e0b75e193 e16991b33eb0ddea18c0699d7ea31710460ff8ada1f51d8e94f1100f6e18d1c8
 ql/lib/codeql/swift/generated/PlatformVersionAvailabilitySpec.qll f82d9ca416fe8bd59b5531b65b1c74c9f317b3297a6101544a11339a1cffce38 7f5c6d3309e66c134107afe55bae76dfc9a72cb7cdd6d4c3706b6b34cee09fa0
 ql/lib/codeql/swift/generated/PureSynthConstructors.qll 173c0dd59396a1de26fe870e3bc2766c46de689da2a4d8807cb62023bbce1a98 173c0dd59396a1de26fe870e3bc2766c46de689da2a4d8807cb62023bbce1a98
-ql/lib/codeql/swift/generated/Raw.qll cda40b44e2b72ceb32a3c03d2f16028fc4db723c8cdc0a9638693794f4f07411 eb4b59f4dbd2159f59132994e6d1840a1273e5c316232b8439ddc0cc08ef8736
-ql/lib/codeql/swift/generated/Synth.qll e26debaea7feaabbdd4180983a03fa406584e2a0dc4902520d5549d106770fee a448e51acba628d63fc4ae59aa23efa7cd5b567230ae24749d31d2a4ad51baf9
-ql/lib/codeql/swift/generated/SynthConstructors.qll bb0c69cea79a06ec3cc0e176fc6e63cfe125107a45373e41083fc4de056133b8 bb0c69cea79a06ec3cc0e176fc6e63cfe125107a45373e41083fc4de056133b8
+ql/lib/codeql/swift/generated/Raw.qll 8d4880e5ee1fdd120adeb7bf0dfa1399e7b1a53b2cc7598aed8e15cbf996d1c0 da0d446347d29f5cd05281c17c24e87610f31c32adb7e05ab8f3a26bed55bd90
+ql/lib/codeql/swift/generated/Synth.qll 551fdf7e4b53f9ee1314d1bb42c2638cf82f45bfa1f40a635dfa7b6072e4418c 9ab178464700a19951fc5285acacda4913addee81515d8e072b3d7055935a814
+ql/lib/codeql/swift/generated/SynthConstructors.qll 2f801bd8b0db829b0253cd459ed3253c1fdfc55dce68ebc53e7fec138ef0aca4 2f801bd8b0db829b0253cd459ed3253c1fdfc55dce68ebc53e7fec138ef0aca4
 ql/lib/codeql/swift/generated/UnknownFile.qll 0fcf9beb8de79440bcdfff4bb6ab3dd139bd273e6c32754e05e6a632651e85f6 0fcf9beb8de79440bcdfff4bb6ab3dd139bd273e6c32754e05e6a632651e85f6
 ql/lib/codeql/swift/generated/UnknownLocation.qll e50efefa02a0ec1ff635a00951b5924602fc8cab57e5756e4a039382c69d3882 e50efefa02a0ec1ff635a00951b5924602fc8cab57e5756e4a039382c69d3882
 ql/lib/codeql/swift/generated/UnspecifiedElement.qll dbc6ca4018012977b26ca184a88044c55b0661e3998cd14d46295b62a8d69625 184c9a0ce18c2ac881943b0fb400613d1401ed1d5564f90716b6c310ba5afe71
-ql/lib/codeql/swift/generated/decl/AbstractFunctionDecl.qll 76408e1672fe4c18d00e6027171a88a994639034bd90052effb649d472b15478 c819f02330635fd3138ae1ebaae49a397c3271d78fbce6e2ecc015bb122de3f9
-ql/lib/codeql/swift/generated/decl/AbstractStorageDecl.qll 882e95e6887741c0cdac4dcafb9efb5182f18484c6d29e84bab0a8f65c9e70a2 0c5c6739484ce3913cfbff68307a5c1cf63639e5ba9043f1f305197fc06b8de9
+ql/lib/codeql/swift/generated/decl/AbstractStorageDecl.qll faac7645fae432c8aa5d970a0e5bdc12946124d3a206deb133d623cbbf06e64e 221c8dbac988bfce1b4c3970dfb97b91b30dff8ac196e1fbde5eb5189cfcadf0
 ql/lib/codeql/swift/generated/decl/AbstractTypeParamDecl.qll 1e268b00d0f2dbbd85aa70ac206c5e4a4612f06ba0091e5253483635f486ccf9 5479e13e99f68f1f347283535f8098964f7fd4a34326ff36ad5711b2de1ab0d0
-ql/lib/codeql/swift/generated/decl/AccessorDecl.qll 443cb9888dbdbaee680bf24469ce097a8292806dc53f0b109d492db621fa00aa 0dbe38cbbd3f3cd880c1569d9d42165e7cf0358da0cc7cb63e89890310ad40a0
+ql/lib/codeql/swift/generated/decl/Accessor.qll c93cdf7dbb87e6c9b09b5fcf469b952041f753914a892addeb24bb46eaa51d29 1e8104da2da146d3e4d8f5f96b87872e63162e53b46f9c7038c75db51a676599
+ql/lib/codeql/swift/generated/decl/AccessorOrNamedFunction.qll b78aaef06cdaa172dce3e1dcd6394566b10ce445906e3cf67f6bef951b1662a4 a30d9c2ff79a313c7d0209d72080fdc0fabf10379f8caed5ff2d72dc518f8ad3
 ql/lib/codeql/swift/generated/decl/AssociatedTypeDecl.qll 4169d083104f9c089223ed3c5968f757b8cd6c726887bbb6fbaf21f5ed7ee144 4169d083104f9c089223ed3c5968f757b8cd6c726887bbb6fbaf21f5ed7ee144
 ql/lib/codeql/swift/generated/decl/CapturedDecl.qll 18ce5a5d548abb86787096e26ffd4d2432eda3076356d50707a3490e9d3d8459 42708248ba4bcd00a628e836ea192a4b438c0ffe91e31d4e98e497ef896fabac
 ql/lib/codeql/swift/generated/decl/ClassDecl.qll a60e8af2fdbcd20cfa2049660c8bcbbc00508fbd3dde72b4778317dfc23c5ae4 a60e8af2fdbcd20cfa2049660c8bcbbc00508fbd3dde72b4778317dfc23c5ae4
-ql/lib/codeql/swift/generated/decl/ConcreteFuncDecl.qll c7192e79ce67f77df36575cceb942f11b182c26c93899469654316de2d543cf9 c7192e79ce67f77df36575cceb942f11b182c26c93899469654316de2d543cf9
 ql/lib/codeql/swift/generated/decl/ConcreteVarDecl.qll 4801ccc477480c4bc4fc117976fbab152e081064e064c97fbb0f37199cb1d0a8 4d7cfbf5b39b307dd673781adc220fdef04213f2e3d080004fa658ba6d3acb8d
-ql/lib/codeql/swift/generated/decl/ConstructorDecl.qll 20e3a37809eacfc43828fa61248ad19b0ff610faad3a12b82b3cf5ed2bcce13c 20e3a37809eacfc43828fa61248ad19b0ff610faad3a12b82b3cf5ed2bcce13c
 ql/lib/codeql/swift/generated/decl/Decl.qll 18f93933c2c00955f6d28b32c68e5b7ac13647ebff071911b26e68dbc57765a7 605e700ab8d83645f02b63234fee9d394b96caba9cad4dd80b3085c2ab63c33d
-ql/lib/codeql/swift/generated/decl/DestructorDecl.qll 8767e3ddabdf05ea5ee99867e9b77e67f7926c305b2fba1ca3abf94e31d836b9 8767e3ddabdf05ea5ee99867e9b77e67f7926c305b2fba1ca3abf94e31d836b9
+ql/lib/codeql/swift/generated/decl/Deinitializer.qll 816ecd92552915d06952517606a6e4c67bc53d7e7d9f5c09b7276e70612627fe 816ecd92552915d06952517606a6e4c67bc53d7e7d9f5c09b7276e70612627fe
 ql/lib/codeql/swift/generated/decl/EnumCaseDecl.qll f71c9d96db8260462c34e5d2bd86dda9b977aeeda087c235b873128b63633b9c e12ff7c0173e3cf9e2b64de66d8a7f2246bc0b2cb721d25b813d7a922212b35a
 ql/lib/codeql/swift/generated/decl/EnumDecl.qll fa4490d511ee537751a4fab2478e65250ff3deba43c74db5341184c9ba25b534 fa4490d511ee537751a4fab2478e65250ff3deba43c74db5341184c9ba25b534
 ql/lib/codeql/swift/generated/decl/EnumElementDecl.qll 5ef4f6839f4f19f29fabd04b653e89484fa68a7e7ec94101a5201aa13d89e9eb 78006fa52b79248302db04348bc40f2f77edf101b6e429613f3089f70750fc11
 ql/lib/codeql/swift/generated/decl/ExtensionDecl.qll 8129015990b6c80cedb796ae0768be2b9c040b5212b5543bc4d6fd994cc105f3 038b06a0c0eeb1ad7e31c995f20aaf4f8804001654ebb0e1e292d7e739a6c8ee
-ql/lib/codeql/swift/generated/decl/FuncDecl.qll 11ebe386dd06937c84fdb283a73be806763d939c163d3c0fd0c4c3eb1caeda41 6a5b6854818cb3d2bc76f0abdee4933ca839c182abd07fb4d271400f5267f6e2
+ql/lib/codeql/swift/generated/decl/Function.qll 92d1fbceb9e96afd00a1dfbfd15cec0063b3cba32be1c593702887acc00a388a 0cbae132d593b0313a2d75a4e428c7f1f07a88c1f0491a4b6fa237bb0da71df3
 ql/lib/codeql/swift/generated/decl/GenericContext.qll 4c7bd7fd372c0c981b706de3a57988b92c65c8a0d83ea419066452244e6880de 332f8a65a6ae1cad4aa913f2d0a763d07393d68d81b61fb8ff9912b987c181bb
 ql/lib/codeql/swift/generated/decl/GenericTypeDecl.qll 71f5c9c6078567dda0a3ac17e2d2d590454776b2459267e31fed975724f84aec 669c5dbd8fad8daf007598e719ac0b2dbcb4f9fad698bffb6f1d0bcd2cee9102
 ql/lib/codeql/swift/generated/decl/GenericTypeParamDecl.qll bc41a9d854e65b1e0da86350870a8fe050eb1dc031cd17ded11c15b5ad8ad183 bc41a9d854e65b1e0da86350870a8fe050eb1dc031cd17ded11c15b5ad8ad183
 ql/lib/codeql/swift/generated/decl/IfConfigDecl.qll 58c1a02a3867105c61d29e2d9bc68165ba88a5571aac0f91f918104938178c1e f74ef097848dd5a89a3427e3d008e2299bde11f1c0143837a8182572ac26f6c9
 ql/lib/codeql/swift/generated/decl/ImportDecl.qll 8892cd34d182c6747e266e213f0239fd3402004370a9be6e52b9747d91a7b61b 2c07217ab1b7ebc39dc2cb20d45a2b1b899150cabd3b1a15cd8b1479bab64578
 ql/lib/codeql/swift/generated/decl/InfixOperatorDecl.qll d98168fdf180f28582bae8ec0242c1220559235230a9c94e9f479708c561ea21 aad805aa74d63116b19f435983d6df6df31cef6a5bbd30d7c2944280b470dee6
+ql/lib/codeql/swift/generated/decl/Initializer.qll a72005f0abebd31b7b91f496ddae8dff49a027ba01b5a827e9b8870ecf34de17 a72005f0abebd31b7b91f496ddae8dff49a027ba01b5a827e9b8870ecf34de17
 ql/lib/codeql/swift/generated/decl/MissingMemberDecl.qll eaf8989eda461ec886a2e25c1e5e80fc4a409f079c8d28671e6e2127e3167479 d74b31b5dfa54ca5411cd5d41c58f1f76cfccc1e12b4f1fdeed398b4faae5355
 ql/lib/codeql/swift/generated/decl/ModuleDecl.qll 0b809c371dae40cfdc7bf869c654158dc154e1551d8466c339742c7fdc26a5db 3d7efb0ccfd752d9f01624d21eba79067824b3910b11185c81f0b513b69e8c51
+ql/lib/codeql/swift/generated/decl/NamedFunction.qll e8c23d8344768fb7ffe31a6146952fb45f66e25c2dd32c91a6161aaa612e602f e8c23d8344768fb7ffe31a6146952fb45f66e25c2dd32c91a6161aaa612e602f
 ql/lib/codeql/swift/generated/decl/NominalTypeDecl.qll 7e8980cd646e9dee91e429f738d6682b18c8f8974c9561c7b936fca01b56fdb2 513e55dd6a68d83a8e884c9a373ecd70eca8e3957e0f5f6c2b06696e4f56df88
 ql/lib/codeql/swift/generated/decl/OpaqueTypeDecl.qll f2cdbc238b9ea67d5bc2defd8ec0455efafd7fdaeca5b2f72d0bbb16a8006d17 041724a6ec61b60291d2a68d228d5f106c02e1ba6bf3c1d3d0a6dda25777a0e5
 ql/lib/codeql/swift/generated/decl/OperatorDecl.qll 3ffdc7ab780ee94a975f0ce3ae4252b52762ca8dbea6f0eb95f951e404c36a5b 25e39ccd868fa2d1fbce0eb7cbf8e9c2aca67d6fd42f76e247fb0fa74a51b230
@@ -434,7 +434,6 @@ ql/lib/codeql/swift/generated/decl/TypeDecl.qll 74bb5f0fe2648d95c84fdce804740f2b
 ql/lib/codeql/swift/generated/decl/ValueDecl.qll 7b4e4c9334be676f242857c77099306d8a0a4357b253f8bc68f71328cedf1f58 f18938c47f670f2e0c27ffd7e31e55f291f88fb50d8e576fcea116d5f9e5c66d
 ql/lib/codeql/swift/generated/decl/VarDecl.qll bdea76fe6c8f721bae52bbc26a2fc1cbd665a19a6920b36097822839158d9d3b 9c91d8159fd7a53cba479d8c8f31f49ad2b1e2617b8cd9e7d1a2cb4796dfa2da
 ql/lib/codeql/swift/generated/expr/AbiSafeConversionExpr.qll f4c913df3f1c139a0533f9a3a2f2e07aee96ab723c957fc7153d68564e4fdd6d f4c913df3f1c139a0533f9a3a2f2e07aee96ab723c957fc7153d68564e4fdd6d
-ql/lib/codeql/swift/generated/expr/AbstractClosureExpr.qll f0060c2972d2e1f9818d8deea3ceebbbe0b19d2ce11adc9b670beb672c4564d3 5f2500c5f3728f81599bd4e1fb9c97ac5a44a6dce8c1ab84a850c62aae3741ff
 ql/lib/codeql/swift/generated/expr/AnyHashableErasureExpr.qll f450ac8e316def1cd64dcb61411bae191144079df7f313a5973e59dc89fe367f f450ac8e316def1cd64dcb61411bae191144079df7f313a5973e59dc89fe367f
 ql/lib/codeql/swift/generated/expr/AnyTryExpr.qll f2929f39407e1717b91fc41f593bd52f1ae14c619d61598bd0668a478a04a91e 62693c2c18678af1ff9ce5393f0dd87c5381e567b340f1a8a9ecf91a92e2e666
 ql/lib/codeql/swift/generated/expr/AppliedPropertyWrapperExpr.qll 191612ec26b3f0d5a61301789a34d9e349b4c9754618760d1c0614f71712e828 cc212df0068ec318c997a83dc6e95bdda5135bccc12d1076b0aebf245da78a4b
@@ -444,7 +443,7 @@ ql/lib/codeql/swift/generated/expr/Argument.qll fe3cf5660e46df1447eac88c97da79b2
 ql/lib/codeql/swift/generated/expr/ArrayExpr.qll 48f9dce31e99466ae3944558584737ea1acd9ce8bf5dc7f366a37de464f5570f ea13647597d7dbc62f93ddbeb4df33ee7b0bd1d9629ced1fc41091bbbe74db9c
 ql/lib/codeql/swift/generated/expr/ArrayToPointerExpr.qll afa9d62eb0f2044d8b2f5768c728558fe7d8f7be26de48261086752f57c70539 afa9d62eb0f2044d8b2f5768c728558fe7d8f7be26de48261086752f57c70539
 ql/lib/codeql/swift/generated/expr/AssignExpr.qll b9cbe998daccc6b8646b754e903667de171fefe6845d73a952ae9b4e84f0ae13 14f1972f704f0b31e88cca317157e6e185692f871ba3e4548c9384bcf1387163
-ql/lib/codeql/swift/generated/expr/AutoClosureExpr.qll 26f2ef81e6e66541da75316f894498e74525c0703076cf67398c73a7cbd9736e 26f2ef81e6e66541da75316f894498e74525c0703076cf67398c73a7cbd9736e
+ql/lib/codeql/swift/generated/expr/AutoClosureExpr.qll 5263d04d6d85ab7a61982cde5da1a3a6b92c0fa1fb1ddf5c651b90ad2fad59b9 5263d04d6d85ab7a61982cde5da1a3a6b92c0fa1fb1ddf5c651b90ad2fad59b9
 ql/lib/codeql/swift/generated/expr/AwaitExpr.qll e17b87b23bd71308ba957b6fe320047b76c261e65d8f9377430e392f831ce2f1 e17b87b23bd71308ba957b6fe320047b76c261e65d8f9377430e392f831ce2f1
 ql/lib/codeql/swift/generated/expr/BinaryExpr.qll 5ace1961cd6d6cf67960e1db97db177240acb6c6c4eba0a99e4a4e0cc2dae2e3 5ace1961cd6d6cf67960e1db97db177240acb6c6c4eba0a99e4a4e0cc2dae2e3
 ql/lib/codeql/swift/generated/expr/BindOptionalExpr.qll 79b8ade1f9c10f4d5095011a651e04ea33b9280cacac6e964b50581f32278825 38197be5874ac9d1221e2d2868696aceedf4d10247021ca043feb21d0a741839
@@ -453,16 +452,15 @@ ql/lib/codeql/swift/generated/expr/BridgeFromObjCExpr.qll b9a6520d01613dfb8c7606
 ql/lib/codeql/swift/generated/expr/BridgeToObjCExpr.qll 31ca13762aee9a6a17746f40ec4e1e929811c81fdadb27c48e0e7ce6a3a6222d 31ca13762aee9a6a17746f40ec4e1e929811c81fdadb27c48e0e7ce6a3a6222d
 ql/lib/codeql/swift/generated/expr/BuiltinLiteralExpr.qll 052f8d0e9109a0d4496da1ae2b461417951614c88dbc9d80220908734b3f70c6 536fa290bb75deae0517d53528237eab74664958bf7fdbf8041283415dda2142
 ql/lib/codeql/swift/generated/expr/CallExpr.qll c7dc105fcb6c0956e20d40f736db35bd7f38f41c3d872858972c2ca120110d36 c7dc105fcb6c0956e20d40f736db35bd7f38f41c3d872858972c2ca120110d36
-ql/lib/codeql/swift/generated/expr/CaptureListExpr.qll dc669082d0c123af7b3aa9f46c2eea3e339b2dd094cb8cab1aa0c8981567580f 3ffc0f61f7ca1333496d81df868cf1dcad004c70901b96144d5af64928027619
+ql/lib/codeql/swift/generated/expr/CaptureListExpr.qll 1366d946d7faff63437c937e71392b505564c944947d25bb9628a86bec9919c2 e8c91265bdbe1b0902c3ffa84252b89ada376188c1bab2c9dde1900fd6bf992b
 ql/lib/codeql/swift/generated/expr/CheckedCastExpr.qll 146c24e72cda519676321d3bdb89d1953dfe1810d2710f04cfdc4210ace24c40 91093e0ba88ec3621b538d98454573b5eea6d43075a2ab0a08f80f9b9be336d3
 ql/lib/codeql/swift/generated/expr/ClassMetatypeToObjectExpr.qll 076c0f7369af3fffc8860429bd8e290962bf7fc8cf53bbba061de534e99cc8bf 076c0f7369af3fffc8860429bd8e290962bf7fc8cf53bbba061de534e99cc8bf
-ql/lib/codeql/swift/generated/expr/ClosureExpr.qll 4c20a922fc4c1f2a0f77026436282d056d0d188cc038443cca0d033dc57cf5a9 4c20a922fc4c1f2a0f77026436282d056d0d188cc038443cca0d033dc57cf5a9
+ql/lib/codeql/swift/generated/expr/ClosureExpr.qll f194fc8c5f67fcf0219e8e2de93ee2b820c27a609b2986b68d57a54445f66b61 3cae87f6c6eefb32195f06bc4c95ff6634446ecf346d3a3c94dc05c1539f3de2
 ql/lib/codeql/swift/generated/expr/CoerceExpr.qll a2656e30dff4adc693589cab20e0419886959c821e542d7f996ab38613fa8456 a2656e30dff4adc693589cab20e0419886959c821e542d7f996ab38613fa8456
 ql/lib/codeql/swift/generated/expr/CollectionExpr.qll 8782f55c91dc77310d9282303ba623cb852a4b5e7a8f6426e7df07a08efb8819 b2ce17bf217fe3df3da54ac2a9896ab052c1daaf5559a5c73cc866ca255a6b74
 ql/lib/codeql/swift/generated/expr/CollectionUpcastConversionExpr.qll 2d007ed079803843a4413466988d659f78af8e6d06089ed9e22a0a8dedf78dbe ca7c3a62aa17613c5cbdc3f88ec466e7cc1d9adf5a73de917899b553c55c4c3f
 ql/lib/codeql/swift/generated/expr/ConditionalBridgeFromObjCExpr.qll 4a21e63cc547021b70ca1b8080903997574ab5a2508a14f780ce08aa4de050de 0b89b75cce8f2a415296e3b08fa707d53d90b2c75087c74c0266c186c81b428b
 ql/lib/codeql/swift/generated/expr/ConditionalCheckedCastExpr.qll 92a999dd1dcc1f498ed2e28b4d65ac697788960a66452a66b5281c287596d42b 92a999dd1dcc1f498ed2e28b4d65ac697788960a66452a66b5281c287596d42b
-ql/lib/codeql/swift/generated/expr/ConstructorRefCallExpr.qll d0662d960b78c3cf7e81cf5b619aa9e2a906d35c094ae32702da96720354fe4f d0662d960b78c3cf7e81cf5b619aa9e2a906d35c094ae32702da96720354fe4f
 ql/lib/codeql/swift/generated/expr/CovariantFunctionConversionExpr.qll b749118590163eafbd538e71e4c903668451f52ae0dabbb13e504e7b1fefa9e1 abaf3f10d35bab1cf6ab44cb2e2eb1768938985ce00af4877d6043560a6b48ec
 ql/lib/codeql/swift/generated/expr/CovariantReturnConversionExpr.qll f1b409f0bf54b149deb1a40fbe337579a0f6eb2498ef176ef5f64bc53e94e2fe 532d6cb2ebbb1e6da4b26df439214a5a64ec1eb8a222917ba2913f4ee8d73bd8
 ql/lib/codeql/swift/generated/expr/DeclRefExpr.qll eee2d4468f965e8e6a6727a3e04158de7f88731d2a2384a33e72e88b9e46a59a 54a91a444e5a0325cd69e70f5a58b8f7aa20aaa3d9b1451b97f491c109a1cd74
@@ -475,7 +473,7 @@ ql/lib/codeql/swift/generated/expr/DifferentiableFunctionExtractOriginalExpr.qll
 ql/lib/codeql/swift/generated/expr/DiscardAssignmentExpr.qll f2cb4a5295855bcfe47a223e0ab9b915c22081fe7dddda801b360aa365604efd f2cb4a5295855bcfe47a223e0ab9b915c22081fe7dddda801b360aa365604efd
 ql/lib/codeql/swift/generated/expr/DotSelfExpr.qll af32541b2a03d91c4b4184b8ebca50e2fe61307c2b438f50f46cd90592147425 af32541b2a03d91c4b4184b8ebca50e2fe61307c2b438f50f46cd90592147425
 ql/lib/codeql/swift/generated/expr/DotSyntaxBaseIgnoredExpr.qll 12c9cf8d2fd3c5245e12f43520de8b7558d65407fa935da7014ac12de8d6887e 49f5f12aeb7430fa15430efd1193f56c7e236e87786e57fd49629bd61daa7981
-ql/lib/codeql/swift/generated/expr/DotSyntaxCallExpr.qll 3768ef558b4fe8c2f0fb4db9b61f84999577a9a4ce5f97fa773a98bf367202ff 3768ef558b4fe8c2f0fb4db9b61f84999577a9a4ce5f97fa773a98bf367202ff
+ql/lib/codeql/swift/generated/expr/DotSyntaxCallExpr.qll 1eedcaafbf5e83b5e535f608ba29e25f0e0de7dbc484e14001362bad132c45d0 1eedcaafbf5e83b5e535f608ba29e25f0e0de7dbc484e14001362bad132c45d0
 ql/lib/codeql/swift/generated/expr/DynamicLookupExpr.qll 0f0d745085364bca3b67f67e3445d530cbd3733d857c76acab2bccedabb5446e f252dd4b1ba1580fc9a32f42ab1b5be49b85120ec10c278083761494d1ee4c5d
 ql/lib/codeql/swift/generated/expr/DynamicMemberRefExpr.qll 2eab0e58a191624a9bf81a25f5ddad841f04001b7e9412a91e49b9d015259bbe 2eab0e58a191624a9bf81a25f5ddad841f04001b7e9412a91e49b9d015259bbe
 ql/lib/codeql/swift/generated/expr/DynamicSubscriptExpr.qll f9d7d2fc89f1b724cab837be23188604cefa2c368fa07e942c7a408c9e824f3d f9d7d2fc89f1b724cab837be23188604cefa2c368fa07e942c7a408c9e824f3d
@@ -485,6 +483,7 @@ ql/lib/codeql/swift/generated/expr/ErasureExpr.qll c232bc7b612429b97dbd4bb2383c2
 ql/lib/codeql/swift/generated/expr/ErrorExpr.qll 8e354eed5655e7261d939f3831eb6fa2961cdd2cebe41e3e3e7f54475e8a6083 8e354eed5655e7261d939f3831eb6fa2961cdd2cebe41e3e3e7f54475e8a6083
 ql/lib/codeql/swift/generated/expr/ExistentialMetatypeToObjectExpr.qll eb0d42aac3f6331011a0e26cf5581c5e0a1b5523d2da94672abdebe70000d65b efe2bc0424e551454acc919abe4dac7fd246b84f1ae0e5d2e31a49cbcf84ce40
 ql/lib/codeql/swift/generated/expr/ExplicitCastExpr.qll d98c1ad02175cfaad739870cf041fcd58143dd4b2675b632b68cda63855a4ceb 2aded243b54c1428ba16c0f131ab5e4480c2004002b1089d9186a435eb3a6ab5
+ql/lib/codeql/swift/generated/expr/ExplicitClosureExpr.qll c5291fb91e04a99133d1b4caf25f8bd6e7f2e7b9d5d99558143899f4dc9a7861 c5291fb91e04a99133d1b4caf25f8bd6e7f2e7b9d5d99558143899f4dc9a7861
 ql/lib/codeql/swift/generated/expr/Expr.qll 68beba5a460429be58ba2dcad990932b791209405345fae35b975fe64444f07e a0a25a6870f8c9f129289cec7929aa3d6ec67e434919f3fb39dc060656bd1529
 ql/lib/codeql/swift/generated/expr/FloatLiteralExpr.qll ae851773886b3d33ab5535572a4d6f771d4b11d6c93e802f01348edb2d80c454 35f103436fc2d1b2cec67b5fbae07b28c054c9687d57cbd3245c38c55d8bde0b
 ql/lib/codeql/swift/generated/expr/ForceTryExpr.qll 062997b5e9a9e993de703856ae6af60fe1950951cf77cdab11b972fb0a5a4ed3 062997b5e9a9e993de703856ae6af60fe1950951cf77cdab11b972fb0a5a4ed3
@@ -497,6 +496,7 @@ ql/lib/codeql/swift/generated/expr/IfExpr.qll d9ef7f9ee06f718fd7f244ca0d892e4b11
 ql/lib/codeql/swift/generated/expr/ImplicitConversionExpr.qll 52dc57e4413ab523d2c2254ce6527d2d9adaaa4e7faba49b02a88df292aa911d 39883081b5feacf1c55ed99499a135c1da53cd175ab6a05a6969625c6247efd7
 ql/lib/codeql/swift/generated/expr/InOutExpr.qll 26d2019105c38695bace614aa9552b901fa5580f463822688ee556b0e0832859 665333c422f6f34f134254cf2a48d3f5f441786517d0916ade5bec717a28d59d
 ql/lib/codeql/swift/generated/expr/InOutToPointerExpr.qll 4b9ceffe43f192fac0c428d66e6d91c3a6e2136b6d4e3c98cdab83b2e6a77719 4b9ceffe43f192fac0c428d66e6d91c3a6e2136b6d4e3c98cdab83b2e6a77719
+ql/lib/codeql/swift/generated/expr/InitializerRefCallExpr.qll 4556d49d78566ad70a5e784a6db4897dc78ef1f30e67f0052dbb070eca8350f0 4556d49d78566ad70a5e784a6db4897dc78ef1f30e67f0052dbb070eca8350f0
 ql/lib/codeql/swift/generated/expr/InjectIntoOptionalExpr.qll b6fafb589901d73e94eb9bb0f5e87b54378d06ccc04c51a9f4c8003d1f23ead6 b6fafb589901d73e94eb9bb0f5e87b54378d06ccc04c51a9f4c8003d1f23ead6
 ql/lib/codeql/swift/generated/expr/IntegerLiteralExpr.qll aa54660c47169a35e396ea44430c3c4ec4353e33df1a00bd82aff7119f5af71b 7ba90cf17dd34080a9923253986b0f2680b44c4a4ba6e0fbad8b39d3b20c44b9
 ql/lib/codeql/swift/generated/expr/InterpolatedStringLiteralExpr.qll 35f79ec9d443165229a2aa4744551e9e288d5cd051ace48a24af96dc99e7184a 28e8a3dc8491bcb91827a6316f16540518b2f85a875c4a03501986730a468935
@@ -504,7 +504,7 @@ ql/lib/codeql/swift/generated/expr/IsExpr.qll b5ca50490cae8ac590b68a1a51b7039a54
 ql/lib/codeql/swift/generated/expr/KeyPathApplicationExpr.qll 232e204a06b8fad3247040d47a1aa34c6736b764ab1ebca6c5dc74c3d4fc0c9b 6b823c483ee33cd6419f0a61a543cfce0cecfd0c90df72e60d01f5df8b3da3c0
 ql/lib/codeql/swift/generated/expr/KeyPathDotExpr.qll ea73a462801fbe5e27b2f47bca4b39f6936d326d15d6de3f18b7afa6ace35878 ea73a462801fbe5e27b2f47bca4b39f6936d326d15d6de3f18b7afa6ace35878
 ql/lib/codeql/swift/generated/expr/KeyPathExpr.qll d78eb3a2805f7a98b23b8cb16aa66308e7a131284b4cd148a96e0b8c600e1db3 9f05ace69b0de3cdd9e9a1a6aafeb4478cd15423d2fa9e818dd049ddb2adfeb9
-ql/lib/codeql/swift/generated/expr/LazyInitializerExpr.qll d8e93dcfa7fa8a00005f30b4aaa426f50d5040db11bef0c3b56558419b6cc110 3ca7d7ca9e52a025c38d7605c509d6758a4d5ceb0543192074c901f5935d4453
+ql/lib/codeql/swift/generated/expr/LazyInitializationExpr.qll b15d59017c4f763de1b944e0630f3f9aafced0114420c976afa98e8db613a695 71a10c48de9a74af880c95a71049b466851fe3cc18b4f7661952829eeb63d1ba
 ql/lib/codeql/swift/generated/expr/LinearFunctionExpr.qll cd4c31bed9d0beb09fdfc57069d28adb3a661c064d9c6f52bb250011d8e212a7 cd4c31bed9d0beb09fdfc57069d28adb3a661c064d9c6f52bb250011d8e212a7
 ql/lib/codeql/swift/generated/expr/LinearFunctionExtractOriginalExpr.qll ee7d3e025815b5af392ffc006ec91e3150130f2bd708ab92dbe80f2efa9e6792 bcf9ed64cca2dcf5bb544f6347de3d6faa059a1900042a36555e11dfbe0a6013
 ql/lib/codeql/swift/generated/expr/LinearToDifferentiableFunctionExpr.qll f7aa178bff083d8e2822fda63de201d9d7f56f7f59f797ec92826001fca98143 c3ef32483f6da294c066c66b1d40159bc51366d817cf64a364f375f5e5dfa8b0
@@ -518,14 +518,14 @@ ql/lib/codeql/swift/generated/expr/MetatypeConversionExpr.qll 714ecbc8ac51fdaaa4
 ql/lib/codeql/swift/generated/expr/MethodLookupExpr.qll 357bc9ab24830ab60c1456c836e8449ce30ee67fe04e2f2e9437b3211b3b9757 687a3b3e6aeab2d4185f59fc001b3a69e83d96023b0589330a13eeefe3502a80
 ql/lib/codeql/swift/generated/expr/NilLiteralExpr.qll 6f44106bc5396c87681676fc3e1239fe052d1a481d0a854afa8b66369668b058 6f44106bc5396c87681676fc3e1239fe052d1a481d0a854afa8b66369668b058
 ql/lib/codeql/swift/generated/expr/NumberLiteralExpr.qll 8acc7df8fe83b7d36d66b2feed0b8859bfde873c6a88dd676c9ebed32f39bd04 4bbafc8996b2e95522d8167417668b536b2651817f732554de3083c4857af96a
-ql/lib/codeql/swift/generated/expr/ObjCSelectorExpr.qll 8b4f7a9668d1cae4058ba460673b3e0b79f05f2fe871fd992ca1b7ea85f7c09d 629a3057c0ff3ede3a18ea8ea1aa29b24bc780d0dc60b51f99793a6001432a4e
+ql/lib/codeql/swift/generated/expr/ObjCSelectorExpr.qll 6a4a36798deb602f4cf48c25da3d487e43efb93d7508e9fc2a4feceaa465df73 7f4b5b8a1adf68c23e169cd45a43436be1f30a15b93aabbf57b8fd64eadc2629
 ql/lib/codeql/swift/generated/expr/ObjectLiteralExpr.qll 541bd1d9efd110a9e3334cd6849ad04f0e8408f1a72456a79d110f2473a8f87c 3c51d651e8d511b177b21c9ecb0189e4e7311c50abe7f57569be6b2fef5bc0d7
 ql/lib/codeql/swift/generated/expr/OneWayExpr.qll bf6dbe9429634a59e831624dde3fe6d32842a543d25a8a5e5026899b7a608a54 dd2d844f3e4b190dfba123cf470a2c2fcfdcc0e02944468742abe816db13f6ba
 ql/lib/codeql/swift/generated/expr/OpaqueValueExpr.qll 354f23d00d5ea2e734fd192130620d26c76c14d5bb7b0a1aa69f17ffb5289793 354f23d00d5ea2e734fd192130620d26c76c14d5bb7b0a1aa69f17ffb5289793
 ql/lib/codeql/swift/generated/expr/OpenExistentialExpr.qll 55cfe105f217a4bdb15d1392705030f1d7dec8c082cafa875301f81440ec0b7b 168389014cddb8fd738e2e84ddd22983e5c620c3c843de51976171038d95adc0
 ql/lib/codeql/swift/generated/expr/OptionalEvaluationExpr.qll 000b00afe1dcdec43f756f699fd3e38212884eab14bf90e3c276d4ca9cb444a6 177bd4bfbb44e9f5aeaaf283b6537f3146900c1376854607827d224a81456f59
 ql/lib/codeql/swift/generated/expr/OptionalTryExpr.qll f0c8dff90faee4fbf07772efda53afe1acc1fd148c16ee4d85a1502a36178e71 f0c8dff90faee4fbf07772efda53afe1acc1fd148c16ee4d85a1502a36178e71
-ql/lib/codeql/swift/generated/expr/OtherConstructorDeclRefExpr.qll c77bf23292e9c8a151ef6baf667a06a2b6a57d05b0bd0a09177522ce5b8c7c33 011d84d72d82ad318697f8af035807a87af5745d5ec9c1ad32a0af9531f8c79e
+ql/lib/codeql/swift/generated/expr/OtherInitializerRefExpr.qll bfaa8c29fcc356c76839400dbf996e2f39af1c8fe77f2df422a4d71cbb3b8aa3 23f67902b58f79ba19b645411756567cc832b164c7f4efcc77319987c9266d5f
 ql/lib/codeql/swift/generated/expr/OverloadedDeclRefExpr.qll 355f2c3c8f23345198ebfffba24e5b465ebdf6cd1ae44290bd211536377a6256 9436286072c690dff1229cddf6837d50704e8d4f1c710803495580cab37a0a1b
 ql/lib/codeql/swift/generated/expr/ParenExpr.qll f3fb35017423ee7360cab737249c01623cafc5affe8845f3898697d3bd2ef9d7 f3fb35017423ee7360cab737249c01623cafc5affe8845f3898697d3bd2ef9d7
 ql/lib/codeql/swift/generated/expr/PointerToPointerExpr.qll 7d6fa806bba09804705f9cef5be66e09cbbbbda9a4c5eae75d4380f1527bb1bd 7d6fa806bba09804705f9cef5be66e09cbbbbda9a4c5eae75d4380f1527bb1bd
@@ -533,7 +533,7 @@ ql/lib/codeql/swift/generated/expr/PostfixUnaryExpr.qll d1094c42aa03158bf89bace0
 ql/lib/codeql/swift/generated/expr/PrefixUnaryExpr.qll f66dee3c70ed257914de4dd4e8501bb49c9fe6c156ddad86cdcc636cf49b5f62 f66dee3c70ed257914de4dd4e8501bb49c9fe6c156ddad86cdcc636cf49b5f62
 ql/lib/codeql/swift/generated/expr/PropertyWrapperValuePlaceholderExpr.qll 011897278a75050f1c55bd3f2378b73b447d5882404fd410c9707cd06d226a0e e4878e3193b8abf7df6f06676d576e1886fd9cd19721583dd66ea67429bc72a1
 ql/lib/codeql/swift/generated/expr/ProtocolMetatypeToObjectExpr.qll b692be6e5b249c095b77f4adcad5760f48bc07f6f53767ee3d236025ee4a2a51 efa47435cde494f3477164c540ac1ce0b036cb9c60f5f8ec7bfca82a88e208fb
-ql/lib/codeql/swift/generated/expr/RebindSelfInConstructorExpr.qll 7796a88c1635b3bd2492563880c995f1a7a0c68f69bad33b8bd77086eb1ce404 aee11e030ba21115931cbc1e34ac001eaafe4460fb3724a078aa4cbda84e4642
+ql/lib/codeql/swift/generated/expr/RebindSelfInInitializerExpr.qll 7e4420bfe346ccc94e7ec9e0c61e7885fa5ad66cca24dc772583350d1fd256e1 62888a035ef882e85173bb9d57bce5e95d6fd6763ceb4067abf1d60468983501
 ql/lib/codeql/swift/generated/expr/RegexLiteralExpr.qll a11eb6f6ce7cebb35ab9ff51eae85f272980140814d7e6bded454069457a1312 bdb4bb65c9f4e187cf743ed13c0213bb7e55db9cc3adeae2169df5e32b003940
 ql/lib/codeql/swift/generated/expr/SelfApplyExpr.qll 8a2d8ee8d0006a519aadbdb9055cfb58a28fd2837f4e3641b357e3b6bda0febe fc64b664b041e57f9ca10d94c59e9723a18d4ff9d70f2389f4c11a2a9f903a6f
 ql/lib/codeql/swift/generated/expr/SequenceExpr.qll 45f976cbc3ce6b3278955a76a55cd0769e69f9bd16e84b40888cd8ebda6be917 ebb090897e4cc4371383aa6771163f73fa2c28f91e6b5f4eed42d7ad018267f3
@@ -668,14 +668,14 @@ ql/test/extractor-tests/generated/KeyPathComponent/KeyPathComponent_getSubscript
 ql/test/extractor-tests/generated/KeyPathComponent/KeyPathComponent_getTupleIndex.ql b7a60a79a6368f410298d6a00c9ccefae47875c540b668a924ebb37d331564a5 798760446f64d552669c87c5c377d41dcdbcbcdbcc20f9c4b58bd15248e3fb0b
 ql/test/extractor-tests/generated/OtherAvailabilitySpec/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/PlatformVersionAvailabilitySpec/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
-ql/test/extractor-tests/generated/decl/AccessorDecl/AccessorDecl.ql 5c017af7e6b16ee68990eec12affe81eb114338bac4d445f4b231fe0f110eccc db86c828a892b0acd150a780914e7e48c280cad473d3680a453bdee03aee1e9d
-ql/test/extractor-tests/generated/decl/AccessorDecl/AccessorDecl_getBody.ql 1d42eb1a5b832cfaf1949b61a01a6a11448a6d4369a44f2511bb31d1d7fc10a8 b326a6743121353f8a66410d3d9151ca969939abcbbe5c411872ca290da45123
-ql/test/extractor-tests/generated/decl/AccessorDecl/AccessorDecl_getCapture.ql 17f9903978c9a8fc607d970532270090cea030ff57c2f6699c37672707ce5c70 cdd7ce47691a84aa5402a8946d4027f7b9dbce930057dfd62c14b470a5710cb0
-ql/test/extractor-tests/generated/decl/AccessorDecl/AccessorDecl_getGenericTypeParam.ql 8648679e9403477c7f97b6df450a0fa623dc9aff0777021ee33f9cc96eef2611 59c384c35804bf205c3c63e8b956e6bc89d3ded7952911c40e7bf156acb56bf8
-ql/test/extractor-tests/generated/decl/AccessorDecl/AccessorDecl_getMember.ql 826f3cd3a3737938ade950555a36506d970894c3c761c07d36f0a6252672e9bc 0e681a49e07b69bf0df10c14864da946b04b2dea2412bdc93c9b5567c77f819a
-ql/test/extractor-tests/generated/decl/AccessorDecl/AccessorDecl_getName.ql a8f7b6cbb8ab43ed612cfbb36b48b5d6dd23b1dbe94a99d95fedf80e3c95f89f d70eb32403c4983c58448fe5c9e2d88bc873ab61e0e310c38356a9a144b42978
-ql/test/extractor-tests/generated/decl/AccessorDecl/AccessorDecl_getParam.ql 7c61c15d75f681c5f5817bdc1e0c1e2594afdc43a5a8889bd385b6cd007d6509 7f6111069c3f289fb3bd21933893757a0adbf8be8f21bf5f8960b6fb26840219
-ql/test/extractor-tests/generated/decl/AccessorDecl/AccessorDecl_getSelfParam.ql 0d773ccd4c84a5280f03341cccff8363479b668541d269311215db866a1cfd53 743d584a8d5d85aa11e96ca44151f1239c750bf8a429d60269129696411a0294
+ql/test/extractor-tests/generated/decl/Accessor/Accessor.ql 8fb08071a437da7a161c987feacfe56d424a88159b39f705abfb1273f830d70b b816cdf9dffa8149fc9747cc0c863275680e435149744176334395600bcb0b95
+ql/test/extractor-tests/generated/decl/Accessor/Accessor_getBody.ql ed8bb0bb96160439dbd22744b6ec0cd9b9bbb0b55eafe4656148e1f7f860eeb3 4660c0f6e58811a1bd6ce98dfc453d9b7b00f5da32cfe0fb1f9d5ff24c4897ac
+ql/test/extractor-tests/generated/decl/Accessor/Accessor_getCapture.ql b12a0a2fd5a53810cc1ccf0b4b42af46cc9e2b1dd3bb5489d569a715ee6231da cc9f6df05e3ad95f061f78ed9877a5296c17ff384a45ec71032ab63a866e173c
+ql/test/extractor-tests/generated/decl/Accessor/Accessor_getGenericTypeParam.ql e1fc97033e0d37f482562be5ebee2f7e37c26512f82a1dcd16ca9d4be2ca335f 19fa5d21e709ee59f2a6560a61f579e09ee90bbbf971ac70857a555965057057
+ql/test/extractor-tests/generated/decl/Accessor/Accessor_getMember.ql d0b6260b9d63e11fd202c612b2e5ed623457ffe53710dc5cbfa8f26f0ff16da3 770c480a389bc5d7c915d5f4d38c672615c0b17cc134508de519da7f794806da
+ql/test/extractor-tests/generated/decl/Accessor/Accessor_getName.ql d01afe57e4161131b4fafb9fad59fc6d0f6220802ff178f433a913d903d9fc49 c9dbae26272c008d1b9ae5fc83d0958c657e9baed8c5e87cb4782ffa7684c382
+ql/test/extractor-tests/generated/decl/Accessor/Accessor_getParam.ql 818a352cf9ee3a9b0592f8b668e0ca540e3ee4351004d38323ca8d95e04630a1 ca8b5b7cdbd5c7c4eab30bdb7dcfb60e7c59deb5d37a8b021b36fb0f5efec79c
+ql/test/extractor-tests/generated/decl/Accessor/Accessor_getSelfParam.ql 260ce6a4fc2a650826a5c372fa1df63d28112623a1671189ea5f44c0d8d45bc2 6f45476da7cf37d450c07ab9651e12f928e104ba6d7f4bf173a265b9b72c89eb
 ql/test/extractor-tests/generated/decl/AssociatedTypeDecl/AssociatedTypeDecl.ql 74579a1907817168b5014ebcb69ab9a85687189c73145f1a7c2d4b334af4eb30 5d1f265f0e6c1d2392a9e37a42a8e184a16e473836c1a45b5dbc4daccc4aeabb
 ql/test/extractor-tests/generated/decl/AssociatedTypeDecl/AssociatedTypeDecl_getBaseType.ql 39d26252c242eec5aaef23951bd76755a4d3cdceff7349b15067fefb2ece14b3 214fdbaa77d32ee6f21bcccf112d46c9d26006552081cc1f90cbb00a527a9d7f
 ql/test/extractor-tests/generated/decl/AssociatedTypeDecl/AssociatedTypeDecl_getMember.ql e662e651d84bddcf49445d7bf5732d0dad30242d32b90f86e40de0010d48fd9c a6b7028468490a12c0a9f4c535cbd5e6c50a6c3519c9d2552d34f9411f904718
@@ -685,16 +685,8 @@ ql/test/extractor-tests/generated/decl/ClassDecl/ClassDecl.ql a76c9710142c368206
 ql/test/extractor-tests/generated/decl/ClassDecl/ClassDecl_getBaseType.ql 5f4fddbb3fb3d003f1485dc4c5a56f7d0d26dfc1d691540085654c4c66e70e69 0b5a5b757ca92e664ef136d26ac682aa5a0e071494d9f09d85f66cd13807e81d
 ql/test/extractor-tests/generated/decl/ClassDecl/ClassDecl_getGenericTypeParam.ql ca0b73a4f31eea47def7a1de017de36b5fdaec96ae98edb03ff00611bfcac572 f9badd62887a30113484496532b3ff9b67ff5047eb5a311aa2ec2e4d91321e0e
 ql/test/extractor-tests/generated/decl/ClassDecl/ClassDecl_getMember.ql f73881b14bb4eaf83dacf60b9e46d440227f90566e2dfb8908a55567626ccdda f78a7261f7ccfe01ca55f7279bd5a1a302fc65ba36b13e779426d173c7465b84
-ql/test/extractor-tests/generated/decl/ConcreteFuncDecl/ConcreteFuncDecl.ql 97813e8d28abdafa300278a7bdef824ca2cf62b0677e31cb7293f2063ffe69de c3c5f8784d1a0f4f38b691cec5b870587ae1c6587d4862681a9bc6ce10ffa73f
-ql/test/extractor-tests/generated/decl/ConcreteFuncDecl/ConcreteFuncDecl_getBody.ql 3c742b9c8d8d8c23d1bef03f559e1b91f0d3848084ba5819f118c323dd1920a2 340d4e4a6312ffaf4c47bbc753828c1e478d84a2d399c66220288c081c8357ca
-ql/test/extractor-tests/generated/decl/ConcreteFuncDecl/ConcreteFuncDecl_getCapture.ql d3fe4c473661944cd3868ee5c2ef9cc7e7da0b414c4b4f7018456b1a4ee44c02 491a3271a4e15c99d5a8b9429a07c63bbf2e311ac2e72604d3118163ba309ba9
-ql/test/extractor-tests/generated/decl/ConcreteFuncDecl/ConcreteFuncDecl_getGenericTypeParam.ql b5e64bf02a5991a1549794af0aaab9ae654c88b5d52a3e04b7ac525b3a64af5e 034a7d0bf7500afa952a28d184d1d073e71c3dcec3bc26fcefaed70aef9de3ce
-ql/test/extractor-tests/generated/decl/ConcreteFuncDecl/ConcreteFuncDecl_getMember.ql aaba9cb097602d761c48de09de059ef2fe112e0c6c64a5f6988a95cddc9155d8 6e6b76a51bd1d9d4ec25865a1c229e5859ca55f11639ccee414a8cac7de1662a
-ql/test/extractor-tests/generated/decl/ConcreteFuncDecl/ConcreteFuncDecl_getName.ql d80c7dfdde294264b6763a7129e666efd98111dbf203a9739c24942659d7f832 396e44281e4f4af2188a4f7d246872b7058132b12f508b88dc60d5bdd14e2092
-ql/test/extractor-tests/generated/decl/ConcreteFuncDecl/ConcreteFuncDecl_getParam.ql 392bc906a24a432b0dd65a18248cab53874e1ea018b44fdf07d8acb55939c85d cf272febc8355d7171308c0b35f65ae0469106c022093f87ffd25d5951eef4a3
-ql/test/extractor-tests/generated/decl/ConcreteFuncDecl/ConcreteFuncDecl_getSelfParam.ql c8a593149db6785d9bc7017a3fcee305832ab434955b4c36ac2842e214f0acac b70a7c18085961d2c907631d69811071deb391c45c94ef7165bf7ce700dabaf9
-ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl.ql 57a1bd716499550f7f578f2fc9243537fc54b034eece623fb37b761785cee808 0945ed19a9f4558755bb3ea7666b0a617333c339e759d49759fc8bfefe4dc2fc
-ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getAccessorDecl.ql 7f1890b891402c7974087bd1621ce7ce2893008a2ab0218396c82e99ce2e6c9d 4d483e18ad2211759e3a57f973679844d28505b84fe2b10b2303a561d0ac7ca5
+ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl.ql 66c20b9245c7f6aa6dabb81e00717a3441ea02176aed2b63e35aa7828d4282cc 4fd1cee669d972dc7295f5640985868e74f570e4ced8750793afb8fa889f438e
+ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getAccessor.ql 22ed8e1f4c57fae2e39087837380f359d6e0c478ce6af272bcaddab2e55beb26 8b1248b8d1da45992ec8d926d0cd2a77eb43f667c41469227b6ea2b60196d94a
 ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getAttachedPropertyWrapperType.ql 0fd114f752aae89ef80bc80e0532aa4849106f6d1af40b1861e4ba191898b69e fdf28e036a1c4dcb0a3aaaa9fb96dcc755ff530ab6f252270c319df9a1d0d7ac
 ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getMember.ql ab8061f4c024d4c4ea3f39211ccfadf9216968b7d8b9bf2dd813dea6b0250586 973bf8a0bcfcf98108267dd89fe9eb658a6096c9462881716f5a6ad260217a97
 ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getParentInitializer.ql c90aa3ae4249af7d436f976773e9208b41d784b57c6d73e23e1993f01262f592 3b1391d6b0605011bec7cc6f3f964ed476273bd5ed4bb5d6590f862aa4e7a2a3
@@ -703,8 +695,7 @@ ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getProper
 ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getPropertyWrapperBackingVarBinding.ql addbf4e32d383fc35b7505a33c5a675feeedd708c4b94ce8fc89c5bc88c36f1f 549c8ec9cf2c1dc6881e848af8be9900d54604a747ded1f04bd5cadf93e5ede3
 ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getPropertyWrapperProjectionVar.ql 502a76b34c78d3cf8f38969671840dc9e28d478ba7afe671963145ba4dc9460d 6125a91820b6b8d139392c32478383e52e40e572e0f92a32f0e513409d2c4e11
 ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getPropertyWrapperProjectionVarBinding.ql 40274aac8b67cb6a285bf91ccdc725ae1556b13ebcc6854a43e759b029733687 44e569aac32148bcce4cd5e8ebb33d7418580b7f5f03dfbd18635db9965b28d9
-ql/test/extractor-tests/generated/decl/ConstructorDecl/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
-ql/test/extractor-tests/generated/decl/DestructorDecl/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/decl/Deinitializer/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/decl/EnumCaseDecl/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/decl/EnumDecl/EnumDecl.ql e1906b751a4b72081a61b175e016f5182fdd0e27518f16017d17e14c65dd4268 8a1dd50e951ed2c25f18823ff8b9ab36dc2dc49703801dd48da443bc384bd9b4
 ql/test/extractor-tests/generated/decl/EnumDecl/EnumDecl_getBaseType.ql 4ace6176a57dd4c759356ddbefc28b25481c80bdeddfeb396d91b07db55af22a d0d1337ccbba45a648fe68fefc51006e14506d4fb7211fb2bde45f7761c4dbf1
@@ -724,18 +715,27 @@ ql/test/extractor-tests/generated/decl/ImportDecl/ImportDecl_getDeclaration.ql a
 ql/test/extractor-tests/generated/decl/ImportDecl/ImportDecl_getImportedModule.ql 0339867ca4f414cceba85df20d12eca64a3eea9847bb02829dc28fa95701e987 8c292768f56cecbdfeb92985212e6b39ecada819891921c3ba1532d88d84c43e
 ql/test/extractor-tests/generated/decl/ImportDecl/ImportDecl_getMember.ql 6d48d3a93bc96dba3bda71ec9d9d6282615c2228a58da6167c169fafaedb3e17 8560b23d0f52b845c81727ce09c0b2f9647965c83d7de165e8cd3d91be5bdd42
 ql/test/extractor-tests/generated/decl/InfixOperatorDecl/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/decl/Initializer/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl.ql f9216e83077ebc0cb5a5bf2d7368af86167a1bfd378f9cd5592fd484a1bbc5dd 1c2de61cb064474340db10de4399c49f15eb0a5669e6dc9587d8b4f656b0134f
 ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl_getAnExportedModule.ql 321619519c5cffefda78f11f2c85a199af76fccbfcc51126c7a558ba12fdfd80 30e48eb820ba9d7f3ec30bf4536c0f84280c5f2ca8c63427f6b77d74a092e68b
 ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl_getAnImportedModule.ql 65fae5b1a7db3a11fd837ed78c663e8907306c36695ae73e4e29559755276fbe 3ddef1a7af7a636e66674fadb3e727ad18655a9ecb4c73fd3d6aca202f1191fb
 ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl_getBaseType.ql 54a4bd2cfa666271ae9092285bb7217b082c88483d614066cfb599fc8ab84305 8b24ab8e93efe3922cb192eb5de5f517763058782e83e8732153421adddd68e1
 ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl_getMember.ql a4663d47cf0a16a07167b9a64d56f8ba8e504a78142c7e216d1df69879df9130 3f6a4080e33bddd1e34fa25519d855811c256182055db4989be8150fcddd541b
+ql/test/extractor-tests/generated/decl/NamedFunction/NamedFunction.ql a56ea8bf7080ba76cee7a1fca2b3e63f09d644663c15e405c8a62ee9506335d3 3b18f5200b09ccbe3087c57d30a50169fc84241a76c406e2b090cf8d214e5596
+ql/test/extractor-tests/generated/decl/NamedFunction/NamedFunction_getBody.ql 91688f59415c479a7e39f61eeccbac09a4fe3fcfdd94f198d7bdbef39ccc892c 760497101fd872d513641b810cae91ff9e436f3c20f4c31b72d36c2d49492ef9
+ql/test/extractor-tests/generated/decl/NamedFunction/NamedFunction_getCapture.ql 886ba37f06245ad27d0cdfcd40841af7e833115be60088238f3228f959f38b4a 5fa4f55ecf42b83386e7280372032c542852d24ff21633264a79a176a3409f81
+ql/test/extractor-tests/generated/decl/NamedFunction/NamedFunction_getGenericTypeParam.ql 7ffd1471731291cc7a4d6d2b53af68ce0376ccaf1e8e64c4e30d83f43358ed6d da8811b63c608cd7270ce047571ec9646e1483d50f51ee113acf2f3564932790
+ql/test/extractor-tests/generated/decl/NamedFunction/NamedFunction_getMember.ql f44e526e4a2ef4dab9e2979bbbc51ae47ad25999b83636ede9836e0f0b920ef4 0fd66c5fd368329c61b7ca4aaa36b4c71d4e71d25f517d94ffb094d2e593bcbf
+ql/test/extractor-tests/generated/decl/NamedFunction/NamedFunction_getName.ql c7cf5b81a8db16ef44c84eb861d4a7f41ce2b9ad733f8853b66d6dc64ed315a3 8000fad2b9b56077e8a262ec2899d765026bd07836622b0cb48327e6d6e9c0a0
+ql/test/extractor-tests/generated/decl/NamedFunction/NamedFunction_getParam.ql ae3ba8026861c4f79e1810457331e838790cbf11537d1b1e2ba38bf3fea5a7cd 10e7c69956784f01e3455d29cd934358347afd4317cf08e12e0385559eb4fd1f
+ql/test/extractor-tests/generated/decl/NamedFunction/NamedFunction_getSelfParam.ql d7d05f91e9ef0c083780b9215e761efc753dbef98789bd7d21c5e40fce322826 ec8e6262e15730532e12dcb6faaf24b10bc5a2c7b0e1ec97fe1d5ed047b1994d
 ql/test/extractor-tests/generated/decl/OpaqueTypeDecl/OpaqueTypeDecl.ql 16ccca5a90cc3133ab085ccb843416abc103f2fcf3423a84fbd7f5c15a5c7f17 242d7ea07842ee3fb0f9905b5cbc0ea744f1116c4591c5f133025260991bfdeb
 ql/test/extractor-tests/generated/decl/OpaqueTypeDecl/OpaqueTypeDecl_getBaseType.ql d030fd55ea5a5443c03e8ba1a024c03e3c68c96c948c850131f59fbac6409402 46816c1a75a4cf11db95884733382e46d5573b6c1116d5de0bfe5ae91fed4c3d
 ql/test/extractor-tests/generated/decl/OpaqueTypeDecl/OpaqueTypeDecl_getGenericTypeParam.ql c147420a91c157ee37a900dd7739bdb386fba5eeaadd84e609d2642d3fdbf2e0 cf1c981b6cb7b84944e9430cfe361905dcc396d4356d7f20a0ba993352bd5b02
 ql/test/extractor-tests/generated/decl/OpaqueTypeDecl/OpaqueTypeDecl_getMember.ql aa601966925c03f066624f4297b01ccc21cfeaba8e803e29c42cc9ef954258b6 4559e1d5257dcfb6cf414538f57fc015e483c06381048066c28b31324a2db09c
 ql/test/extractor-tests/generated/decl/OpaqueTypeDecl/OpaqueTypeDecl_getOpaqueGenericParam.ql 2b4264a68817f53ddd73e4fd80e9f7c3a5fcfa4d0692135e2d3b10c8a8379d98 c2efac460b655e726d898b2b80cbfce24820a922e26935804ddd21ae9c474085
-ql/test/extractor-tests/generated/decl/ParamDecl/ParamDecl.ql 5cd8b94d6c0d2fa7ecc554d4231ca6e9fc19524d33ebc4c551dbb5f89e77bc11 509f3bac1ed171d81c848de994403f3eeed3636f780c3bef2e45263e0497b571
-ql/test/extractor-tests/generated/decl/ParamDecl/ParamDecl_getAccessorDecl.ql bf6bd41b1eedad87a2d86acb4b183ddbd150119a0301ec56c6d7129fe5dee453 247fe28adde08cb86e03f9f21c32ea96b8bdc522b848bb84a592292338cac6b1
+ql/test/extractor-tests/generated/decl/ParamDecl/ParamDecl.ql 44e04f4d8753f19be04200f6a6fe5f5e8ed77c1a7c4026ae0ff640878ec19650 2a4d994754aa0560d12c15ff39bbc4b7d83116e7b4a9ea46f432a6a267a661de
+ql/test/extractor-tests/generated/decl/ParamDecl/ParamDecl_getAccessor.ql a29956d6876079a4062ff48fc4475f9718cfb545cb6252cfa1423e8872666d03 a048d661ad1c23e02fb6c441d7cca78dd773432c08800e06d392469c64952163
 ql/test/extractor-tests/generated/decl/ParamDecl/ParamDecl_getAttachedPropertyWrapperType.ql 3642cfd3ecf47a6b81a1745dc043131df349b898a937445eadfdee9f69aec3fc 97137c6673c45b0743db310b0839426eab71f5bc80ccc7bab99c304b8198159f
 ql/test/extractor-tests/generated/decl/ParamDecl/ParamDecl_getMember.ql b811867588bd320b9dcd116451a173c40581b36ba40b1ecb2da57033967d50df 523c22740e366edb880706fd11adcb1aaaa81509090bd2d0f0265ec5d2b431c2
 ql/test/extractor-tests/generated/decl/ParamDecl/ParamDecl_getParentInitializer.ql f0ecd0352a7e34e13040f31440a6170b0661b625c65b35d13021731b6db0f441 9fc89925050c9538ba3ba0b8c45278e30dffba64b53002f675e3f7a9ef014539
@@ -768,12 +768,8 @@ ql/test/extractor-tests/generated/expr/BindOptionalExpr/MISSING_SOURCE.txt 66846
 ql/test/extractor-tests/generated/expr/BooleanLiteralExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/CallExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/CaptureListExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
-ql/test/extractor-tests/generated/expr/ClosureExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/CoerceExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/ConditionalCheckedCastExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
-ql/test/extractor-tests/generated/expr/ConstructorRefCallExpr/ConstructorRefCallExpr.ql 0214077b52ed4c152c70bbd0347c7340d42e584954fba5242f1380e357ec79a0 f8ce48428247f8616c15d39198bf8b3857f1acca12a800bcc912c34720f5f039
-ql/test/extractor-tests/generated/expr/ConstructorRefCallExpr/ConstructorRefCallExpr_getArgument.ql a3a01f99aa8df3aafed50cc7828829e567e01fed7874854e7a620904f1641fc9 962669b36b9adbc3d75bae79a9a754692c20d6e14ee2b47aca8f3f93b27895da
-ql/test/extractor-tests/generated/expr/ConstructorRefCallExpr/ConstructorRefCallExpr_getType.ql c3504dda8c41ebc386a9011deb06b0f5312538306b5ca10f7c4ff2e0f2c277dd aa6785ac86fe4954ef679fdfa6cd91f964d9281ab0162240b6e4b9eb67b0eda3
 ql/test/extractor-tests/generated/expr/DeclRefExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/DefaultArgumentExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/DictionaryExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
@@ -788,6 +784,7 @@ ql/test/extractor-tests/generated/expr/DynamicLookupExpr/DynamicLookupExpr_getTy
 ql/test/extractor-tests/generated/expr/DynamicTypeExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/EnumIsCaseExpr/EnumIsCaseExpr.ql 9a4505f330e014769509be594299bcaa046d0a2c9a8ce4ac3a1d6d6b050af317 92c8392ded3fb26af7434b8aae34b1649b4c808acafc3adbd8ecb60ada5f6e72
 ql/test/extractor-tests/generated/expr/EnumIsCaseExpr/EnumIsCaseExpr_getType.ql edc2e175c971465f5667c4586bc4c77e5c245d267f80009a049b8f657238a5f4 5df26b5bdf975ba910a7c3446705c3ac82a67d05565d860fe58464ee82bafdde
+ql/test/extractor-tests/generated/expr/ExplicitClosureExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/FloatLiteralExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/ForceTryExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/ForceValueExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
@@ -798,6 +795,9 @@ ql/test/extractor-tests/generated/expr/IfExpr/MISSING_SOURCE.txt 66846d526b0bc43
 ql/test/extractor-tests/generated/expr/ImplicitConversionExpr/ImplicitConversionExpr.ql 7ffb80368c4d80adccaa0267cc76b42b76304d5d485286f82e22ae51776812f3 51b38032cb3d392be56fa8bdf53379a174cf3de39d4bf6b730c611ae3ab7cec8
 ql/test/extractor-tests/generated/expr/ImplicitConversionExpr/ImplicitConversionExpr_getType.ql 184ff1dec5d65024c8a0c2b316706ac58c68c62c715c266211e947168750c89a 486fc8d65c0db86bdada2d540f665278caab43454a69ccc8c2e702729397fef0
 ql/test/extractor-tests/generated/expr/InOutExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/InitializerRefCallExpr/InitializerRefCallExpr.ql b9fa70b73983f8b2b61669fb1cd5993d81cf679e3b03085c9c291cde459f9eec 6bd70ac2b43a35d7925d9eb156b8063f7e30535eeeaa669b289c8256ef4ccf80
+ql/test/extractor-tests/generated/expr/InitializerRefCallExpr/InitializerRefCallExpr_getArgument.ql a5ce633986488b8b3aafe593f71ffffe413adb94201a2099f05806d94a5a456b 2a7e25c0141d84b364b8f17cf5d8fa19cf48b690ebbbd773c7a061ab66e16dd4
+ql/test/extractor-tests/generated/expr/InitializerRefCallExpr/InitializerRefCallExpr_getType.ql f913bc92d5b225a2da441ea7c1b8c1ffc24273c25a779dc861bf6eaf87ed00fc a36a4a963c1969f801b9bc96686aad64e303bb8ac02025249eda02a4eae84431
 ql/test/extractor-tests/generated/expr/IntegerLiteralExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/InterpolatedStringLiteralExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/IsExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
@@ -807,7 +807,7 @@ ql/test/extractor-tests/generated/expr/KeyPathExpr/KeyPathExpr.ql 3eddbfac203a76
 ql/test/extractor-tests/generated/expr/KeyPathExpr/KeyPathExpr_getComponent.ql ce38c747737e13f80a212576ae943f0a770fc87a15dabcb0d730515aeb530a3f a50138c47e61e9eab4131a03e1b3e065ed0fca1452c6a3d4f8f48a6124d445be
 ql/test/extractor-tests/generated/expr/KeyPathExpr/KeyPathExpr_getRoot.ql 61d8d0f50c62e6bdf98005609861f6f4fd16e59c439706abf03ba27f87ed3cb1 403ee884bb83b7a4207993afbda7964e676f5f64923ce11e65a0cf8bd199e01d
 ql/test/extractor-tests/generated/expr/KeyPathExpr/KeyPathExpr_getType.ql 992497671107be454ffe1f42b513a5bca37bd31849587ad55f6bd87d8ac5d4a7 b51109f0d9e5e6238d8ab9e67f24d435a873a7884308c4f01ec4ecad51ed031d
-ql/test/extractor-tests/generated/expr/LazyInitializerExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/LazyInitializationExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/MagicIdentifierLiteralExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/MakeTemporarilyEscapableExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/MemberRefExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
@@ -823,7 +823,7 @@ ql/test/extractor-tests/generated/expr/OpaqueValueExpr/MISSING_SOURCE.txt 66846d
 ql/test/extractor-tests/generated/expr/OpenExistentialExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/OptionalEvaluationExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/OptionalTryExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
-ql/test/extractor-tests/generated/expr/OtherConstructorDeclRefExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/OtherInitializerRefExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/PostfixUnaryExpr/PostfixUnaryExpr.ql 7687a79d05efbbae7ce68780cb946cb500ed79c5e03aa0f3c132d0b98b6efe80 f23082710afb2bc247acab84b669540664461f0ec04a946125f17586640dfba8
 ql/test/extractor-tests/generated/expr/PostfixUnaryExpr/PostfixUnaryExpr_getArgument.ql 3b0e6f81599e5565bb78aff753932776c933fefdc8dc49e57db9f5b4164017f6 43031a3d0baa58f69b89a8a5d69f1a40ffeeaddc8a630d241e107de63ea54532
 ql/test/extractor-tests/generated/expr/PostfixUnaryExpr/PostfixUnaryExpr_getType.ql fa909883140fe89084c289c18ebc681402c38d0f37159d01f043f62de80521fc 4cd748e201e9374e589eaa0e3cc10310a1378bba15272a327d5cf54dbd526e8f
@@ -831,7 +831,7 @@ ql/test/extractor-tests/generated/expr/PrefixUnaryExpr/MISSING_SOURCE.txt 66846d
 ql/test/extractor-tests/generated/expr/PropertyWrapperValuePlaceholderExpr/PropertyWrapperValuePlaceholderExpr.ql 9ac73f157d11e4ee1c47dceaadd2f686893da6557e4e600c62edad90db2eb92d bf353009ee1b6127350d976f2e869b615d54b998e59664bdb25ea8d6ab5b132d
 ql/test/extractor-tests/generated/expr/PropertyWrapperValuePlaceholderExpr/PropertyWrapperValuePlaceholderExpr_getType.ql 0972415a8ac29f460d480990f85c3976ad947e26510da447bbf74ee61d9b3f4e 463b8ce871911b99c495ea84669b4e6f8eafc645df483f6a99413e930bc0275e
 ql/test/extractor-tests/generated/expr/PropertyWrapperValuePlaceholderExpr/PropertyWrapperValuePlaceholderExpr_getWrappedValue.ql 208153f062b04bec13a860b64ea51c1d531597140d81a6d4598294dc9f8649a2 dfaea19e1075c02dfc0366fac8fd2edfae8dde06308730eb462c54be5b571129
-ql/test/extractor-tests/generated/expr/RebindSelfInConstructorExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
+ql/test/extractor-tests/generated/expr/RebindSelfInInitializerExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/RegexLiteralExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/StringLiteralExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
 ql/test/extractor-tests/generated/expr/SubscriptExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
--- a/swift/ql/lib/codeql/swift/StringFormat.qll
+++ b/swift/ql/lib/codeql/swift/StringFormat.qll
@@ -7,7 +7,7 @@ import swift
 /**
 * A function that takes a `printf` style format argument.
 */
-abstract class FormattingFunction extends AbstractFunctionDecl {
+abstract class FormattingFunction extends Function {
  /**
   * Gets the position of the format argument.
   */
@@ -32,7 +32,7 @@ class FormattingFunctionCall extends CallExpr {
 * An initializer for `String`, `NSString` or `NSMutableString` that takes a
 * `printf` style format argument.
 */
-class StringInitWithFormat extends FormattingFunction, MethodDecl {
+class StringInitWithFormat extends FormattingFunction, Method {
  StringInitWithFormat() {
    exists(string fName |
      this.hasQualifiedName(["String", "NSString", "NSMutableString"], fName) and
@@ -46,7 +46,7 @@ class StringInitWithFormat extends FormattingFunction, MethodDecl {
 /**
 * The `localizedStringWithFormat` method of `String`, `NSString` and `NSMutableString`.
 */
-class LocalizedStringWithFormat extends FormattingFunction, MethodDecl {
+class LocalizedStringWithFormat extends FormattingFunction, Method {
  LocalizedStringWithFormat() {
    this.hasQualifiedName(["String", "NSString", "NSMutableString"],
      "localizedStringWithFormat(_:_:)")
@@ -58,7 +58,7 @@ class LocalizedStringWithFormat extends FormattingFunction, MethodDecl {
 /**
 * The functions `NSLog` and `NSLogv`.
 */
-class NsLog extends FormattingFunction, FreeFunctionDecl {
+class NsLog extends FormattingFunction, FreeFunction {
  NsLog() { this.getName() = ["NSLog(_:_:)", "NSLogv(_:_:)"] }

  override int getFormatParameterIndex() { result = 0 }
@@ -67,7 +67,7 @@ class NsLog extends FormattingFunction, FreeFunctionDecl {
 /**
 * The `NSException.raise` method.
 */
-class NsExceptionRaise extends FormattingFunction, MethodDecl {
+class NsExceptionRaise extends FormattingFunction, Method {
  NsExceptionRaise() { this.hasQualifiedName("NSException", "raise(_:format:arguments:)") }

  override int getFormatParameterIndex() { result = 1 }
--- a/swift/ql/lib/codeql/swift/controlflow/CfgNodes.qll
+++ b/swift/ql/lib/codeql/swift/controlflow/CfgNodes.qll
@@ -136,7 +136,7 @@ class PropertyGetterCfgNode extends CfgNode {

  CfgNode getBase() { result.getAst() = n.getBase() }

-  AccessorDecl getAccessorDecl() { result = n.getAccessorDecl() }
+  Accessor getAccessor() { result = n.getAccessor() }
 }

 /** A control-flow node that wraps a property setter. */
@@ -149,7 +149,7 @@ class PropertySetterCfgNode extends CfgNode {

  CfgNode getSource() { result.getAst() = n.getAssignExpr().getSource() }

-  AccessorDecl getAccessorDecl() { result = n.getAccessorDecl() }
+  Accessor getAccessor() { result = n.getAccessor() }
 }

 class PropertyObserverCfgNode extends CfgNode {
@@ -161,7 +161,7 @@ class PropertyObserverCfgNode extends CfgNode {

  CfgNode getSource() { result.getAst() = n.getAssignExpr().getSource() }

-  AccessorDecl getAccessorDecl() { result = n.getObserver() }
+  Accessor getAccessor() { result = n.getObserver() }
 }

 class ApplyExprCfgNode extends ExprCfgNode {
@@ -171,7 +171,7 @@ class ApplyExprCfgNode extends ExprCfgNode {

  CfgNode getQualifier() { result.getAst() = e.getQualifier() }

-  AbstractFunctionDecl getStaticTarget() { result = e.getStaticTarget() }
+  Callable getStaticTarget() { result = e.getStaticTarget() }

  Expr getFunction() { result = e.getFunction() }
 }
--- a/swift/ql/lib/codeql/swift/controlflow/internal/Completion.qll
+++ b/swift/ql/lib/codeql/swift/controlflow/internal/Completion.qll
@@ -309,7 +309,7 @@ private predicate mayHaveThrowCompletion(ControlFlowElement n) {
  isThrowingType(n.asAstNode().(ApplyExpr).getFunction().getType())
  or
  // Getters are the only accessor declarators that may throw.
-  exists(AccessorDecl accessor | isThrowingType(accessor.getInterfaceType()) |
+  exists(Accessor accessor | isThrowingType(accessor.getInterfaceType()) |
    isPropertyGetterElement(n, accessor, _)
  )
 }
--- a/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowElements.qll
+++ b/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowElements.qll
@@ -3,13 +3,13 @@ private import swift
 cached
 newtype TControlFlowElement =
  TAstElement(AstNode n) or
-  TFuncDeclElement(AbstractFunctionDecl func) { func.hasBody() } or
-  TClosureElement(ClosureExpr clos) or
+  TFuncDeclElement(Function func) { func.hasBody() } or
+  TClosureElement(ExplicitClosureExpr clos) or
  TPropertyGetterElement(Decl accessor, Expr ref) { isPropertyGetterElement(accessor, ref) } or
-  TPropertySetterElement(AccessorDecl accessor, AssignExpr assign) {
+  TPropertySetterElement(Accessor accessor, AssignExpr assign) {
    isPropertySetterElement(accessor, assign)
  } or
-  TPropertyObserverElement(AccessorDecl observer, AssignExpr assign) {
+  TPropertyObserverElement(Accessor observer, AssignExpr assign) {
    isPropertyObserverElement(observer, assign)
  } or
  TKeyPathElement(KeyPathExpr expr)
@@ -24,19 +24,19 @@ predicate ignoreAstElement(AstNode n) {
  isPropertySetterElement(_, n)
 }

-private AccessorDecl getAnAccessorDecl(Decl d) {
-  result = d.(VarDecl).getAnAccessorDecl() or
-  result = d.(SubscriptDecl).getAnAccessorDecl()
+private Accessor getAnAccessor(Decl d) {
+  result = d.(VarDecl).getAnAccessor() or
+  result = d.(SubscriptDecl).getAnAccessor()
 }

-predicate isPropertyGetterElement(AccessorDecl accessor, Expr ref) {
+predicate isPropertyGetterElement(Accessor accessor, Expr ref) {
  hasDirectToImplementationOrOrdinarySemantics(ref) and
  isRValue(ref) and
  accessor.isGetter() and
-  accessor = getAnAccessorDecl([ref.(LookupExpr).getMember(), ref.(DeclRefExpr).getDecl()])
+  accessor = getAnAccessor([ref.(LookupExpr).getMember(), ref.(DeclRefExpr).getDecl()])
 }

-predicate isPropertyGetterElement(PropertyGetterElement pge, AccessorDecl accessor, Expr ref) {
+predicate isPropertyGetterElement(PropertyGetterElement pge, Accessor accessor, Expr ref) {
  pge = TPropertyGetterElement(accessor, ref)
 }

@@ -60,32 +60,30 @@ private predicate hasDirectToImplementationOrOrdinarySemantics(Expr e) {
  hasDirectToImplementationSemantics(e) or hasOrdinarySemantics(e)
 }

-private predicate isPropertySetterElement(AccessorDecl accessor, AssignExpr assign) {
+private predicate isPropertySetterElement(Accessor accessor, AssignExpr assign) {
  exists(Expr lhs | lhs = assign.getDest() |
    hasDirectToImplementationOrOrdinarySemantics(lhs) and
    accessor.isSetter() and
    isLValue(lhs) and
-    accessor = getAnAccessorDecl([lhs.(LookupExpr).getMember(), lhs.(DeclRefExpr).getDecl()])
+    accessor = getAnAccessor([lhs.(LookupExpr).getMember(), lhs.(DeclRefExpr).getDecl()])
  )
 }

-predicate isPropertySetterElement(
-  PropertySetterElement pse, AccessorDecl accessor, AssignExpr assign
-) {
+predicate isPropertySetterElement(PropertySetterElement pse, Accessor accessor, AssignExpr assign) {
  pse = TPropertySetterElement(accessor, assign)
 }

-private predicate isPropertyObserverElement(AccessorDecl observer, AssignExpr assign) {
+private predicate isPropertyObserverElement(Accessor observer, AssignExpr assign) {
  exists(Expr lhs | lhs = assign.getDest() |
    hasDirectToImplementationOrOrdinarySemantics(lhs) and
    observer.isPropertyObserver() and
    isLValue(lhs) and
-    observer = getAnAccessorDecl([lhs.(LookupExpr).getMember(), lhs.(DeclRefExpr).getDecl()])
+    observer = getAnAccessor([lhs.(LookupExpr).getMember(), lhs.(DeclRefExpr).getDecl()])
  )
 }

 predicate isPropertyObserverElement(
-  PropertyObserverElement poe, AccessorDecl accessor, AssignExpr assign
+  PropertyObserverElement poe, Accessor accessor, AssignExpr assign
 ) {
  poe = TPropertyObserverElement(accessor, assign)
 }
@@ -111,7 +109,7 @@ class AstElement extends ControlFlowElement, TAstElement {
 }

 class PropertyGetterElement extends ControlFlowElement, TPropertyGetterElement {
-  AccessorDecl accessor;
+  Accessor accessor;
  Expr ref;

  PropertyGetterElement() { this = TPropertyGetterElement(accessor, ref) }
@@ -122,13 +120,13 @@ class PropertyGetterElement extends ControlFlowElement, TPropertyGetterElement {

  Expr getRef() { result = ref }

-  AccessorDecl getAccessorDecl() { result = accessor }
+  Accessor getAccessor() { result = accessor }

  Expr getBase() { result = ref.(LookupExpr).getBase() }
 }

 class PropertySetterElement extends ControlFlowElement, TPropertySetterElement {
-  AccessorDecl accessor;
+  Accessor accessor;
  AssignExpr assign;

  PropertySetterElement() { this = TPropertySetterElement(accessor, assign) }
@@ -137,7 +135,7 @@ class PropertySetterElement extends ControlFlowElement, TPropertySetterElement {

  override Location getLocation() { result = assign.getLocation() }

-  AccessorDecl getAccessorDecl() { result = accessor }
+  Accessor getAccessor() { result = accessor }

  AssignExpr getAssignExpr() { result = assign }

@@ -145,7 +143,7 @@ class PropertySetterElement extends ControlFlowElement, TPropertySetterElement {
 }

 class PropertyObserverElement extends ControlFlowElement, TPropertyObserverElement {
-  AccessorDecl observer;
+  Accessor observer;
  AssignExpr assign;

  PropertyObserverElement() { this = TPropertyObserverElement(observer, assign) }
@@ -160,7 +158,7 @@ class PropertyObserverElement extends ControlFlowElement, TPropertyObserverEleme

  override Location getLocation() { result = assign.getLocation() }

-  AccessorDecl getObserver() { result = observer }
+  Accessor getObserver() { result = observer }

  predicate isWillSet() { observer.isWillSet() }

@@ -172,7 +170,7 @@ class PropertyObserverElement extends ControlFlowElement, TPropertyObserverEleme
 }

 class FuncDeclElement extends ControlFlowElement, TFuncDeclElement {
-  AbstractFunctionDecl func;
+  Function func;

  FuncDeclElement() { this = TFuncDeclElement(func) }

@@ -180,7 +178,7 @@ class FuncDeclElement extends ControlFlowElement, TFuncDeclElement {

  override Location getLocation() { result = func.getLocation() }

-  AbstractFunctionDecl getAst() { result = func }
+  Function getAst() { result = func }
 }

 class KeyPathElement extends ControlFlowElement, TKeyPathElement {
@@ -196,13 +194,13 @@ class KeyPathElement extends ControlFlowElement, TKeyPathElement {
 }

 class ClosureElement extends ControlFlowElement, TClosureElement {
-  ClosureExpr expr;
+  ExplicitClosureExpr expr;

  ClosureElement() { this = TClosureElement(expr) }

  override Location getLocation() { result = expr.getLocation() }

-  ClosureExpr getAst() { result = expr }
+  ExplicitClosureExpr getAst() { result = expr }

  override string toString() { result = expr.toString() }
 }
--- a/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImpl.qll
@@ -47,7 +47,7 @@ module CfgScope {
    abstract predicate exit(ControlFlowElement last, Completion c);
  }

-  private class BodyStmtCallableScope extends Range_ instanceof AbstractFunctionDecl {
+  private class BodyStmtCallableScope extends Range_ instanceof Function {
    Decls::FuncDeclTree tree;

    BodyStmtCallableScope() { tree.getAst() = this }
@@ -67,7 +67,7 @@ module CfgScope {
    final override predicate exit(ControlFlowElement last, Completion c) { last(tree, last, c) }
  }

-  private class ClosureExprScope extends Range_ instanceof ClosureExpr {
+  private class ClosureExprScope extends Range_ instanceof ExplicitClosureExpr {
    Exprs::ClosureExprTree tree;

    ClosureExprScope() { tree.getAst() = this }
@@ -1002,17 +1002,17 @@ module Decls {
   * }
   * ```
   */
-  private class AbstractFunctionDeclTree extends AstLeafTree {
-    override AbstractFunctionDecl ast;
+  private class FunctionTree extends AstLeafTree {
+    override Function ast;
  }

  /** The control-flow of a function declaration body. */
  class FuncDeclTree extends StandardPreOrderTree, TFuncDeclElement {
-    AbstractFunctionDecl ast;
+    Function ast;

    FuncDeclTree() { this = TFuncDeclElement(ast) }

-    AbstractFunctionDecl getAst() { result = ast }
+    Function getAst() { result = ast }

    final override ControlFlowElement getChildElement(int i) {
      i = -1 and
@@ -1107,12 +1107,12 @@ module Exprs {
     * direct-to-implementation-access semantics.
     */
    class PropertyAssignExpr extends AssignExprTree {
-      AccessorDecl accessorDecl;
+      Accessor accessor;

-      PropertyAssignExpr() { isPropertySetterElement(_, accessorDecl, ast) }
+      PropertyAssignExpr() { isPropertySetterElement(_, accessor, ast) }

      final override predicate isLast(ControlFlowElement last, Completion c) {
-        isPropertySetterElement(last, accessorDecl, ast) and
+        isPropertySetterElement(last, accessor, ast) and
        completionIsValidFor(c, last)
      }

@@ -1138,11 +1138,11 @@ module Exprs {
  }

  class ClosureExprTree extends StandardPreOrderTree, TClosureElement {
-    ClosureExpr expr;
+    ExplicitClosureExpr expr;

    ClosureExprTree() { this = TClosureElement(expr) }

-    ClosureExpr getAst() { result = expr }
+    ExplicitClosureExpr getAst() { result = expr }

    final override ControlFlowElement getChildElement(int i) {
      result.asAstNode() = expr.getParam(i)
@@ -1175,8 +1175,8 @@ module Exprs {
    class Closure = @auto_closure_expr or @closure_expr;

    // TODO: Traverse the expressions in the capture list once we extract it.
-    private class ClosureTree extends AstLeafTree {
-      override ClosureExpr ast;
+    private class ExplicitClosureTree extends AstLeafTree {
+      override ExplicitClosureExpr ast;
    }

    /**
@@ -1308,8 +1308,8 @@ module Exprs {
    }
  }

-  private class RebindSelfInConstructorTree extends AstStandardPostOrderTree {
-    override RebindSelfInConstructorExpr ast;
+  private class RebindSelfInInitializerTree extends AstStandardPostOrderTree {
+    override RebindSelfInInitializerExpr ast;

    final override ControlFlowElement getChildElement(int i) {
      result.asAstNode() = ast.getSubExpr().getFullyConverted() and i = 0
@@ -1342,8 +1342,8 @@ module Exprs {
    }
  }

-  private class LazyInitializerTree extends AstStandardPostOrderTree {
-    override LazyInitializerExpr ast;
+  private class LazyInitializationTree extends AstStandardPostOrderTree {
+    override LazyInitializationExpr ast;

    final override ControlFlowElement getChildElement(int i) {
      result.asAstNode() = ast.getSubExpr().getFullyConverted() and i = 0
@@ -1426,8 +1426,8 @@ module Exprs {
      DeclRefExprLValueTree() { isLValue(ast) }
    }

-    class OtherConstructorDeclRefTree extends AstLeafTree {
-      override OtherConstructorDeclRefExpr ast;
+    class OtherInitializerRefTree extends AstLeafTree {
+      override OtherInitializerRefExpr ast;
    }

    abstract class DeclRefExprRValueTree extends AstControlFlowTree {
@@ -1443,7 +1443,7 @@ module Exprs {
    }

    private class PropertyDeclRefRValueTree extends DeclRefExprRValueTree {
-      AccessorDecl accessor;
+      Accessor accessor;

      PropertyDeclRefRValueTree() { isPropertyGetterElement(_, accessor, ast) }

@@ -1550,7 +1550,7 @@ module Exprs {
     * or ordinary semantics that includes a getter.
     */
    private class PropertyMemberRefRValue extends MemberRefRValueTree {
-      AccessorDecl accessor;
+      Accessor accessor;

      PropertyMemberRefRValue() { isPropertyGetterElement(_, accessor, ast) }

--- a/swift/ql/lib/codeql/swift/controlflow/internal/Scope.qll
+++ b/swift/ql/lib/codeql/swift/controlflow/internal/Scope.qll
@@ -3,7 +3,7 @@ private import codeql.swift.generated.ParentChild
 private import codeql.swift.generated.Synth

 module CallableBase {
-  class TypeRange = Synth::TAbstractFunctionDecl or Synth::TKeyPathExpr or Synth::TClosureExpr;
+  class TypeRange = Synth::TFunction or Synth::TKeyPathExpr or Synth::TClosureExpr;

  class Range extends Scope::Range, TypeRange { }
 }
--- a/swift/ql/lib/codeql/swift/dataflow/ExternalFlow.qll
+++ b/swift/ql/lib/codeql/swift/dataflow/ExternalFlow.qll
@@ -378,7 +378,7 @@ private predicate elementSpec(
  summaryModel(namespace, type, subtypes, name, signature, ext, _, _, _, _)
 }

-private string paramsStringPart(AbstractFunctionDecl c, int i) {
+private string paramsStringPart(Function c, int i) {
  i = -1 and result = "(" and exists(c)
  or
  exists(int n, string p | c.getParam(n).getType().toString() = p |
@@ -397,12 +397,10 @@ private string paramsStringPart(AbstractFunctionDecl c, int i) {
 * Parameter types are represented by their type erasure.
 */
 cached
-string paramsString(AbstractFunctionDecl c) {
-  result = concat(int i | | paramsStringPart(c, i) order by i)
-}
+string paramsString(Function c) { result = concat(int i | | paramsStringPart(c, i) order by i) }

 bindingset[func]
-predicate matchesSignature(AbstractFunctionDecl func, string signature) {
+predicate matchesSignature(Function func, string signature) {
  signature = "" or
  paramsString(func) = signature
 }
@@ -425,17 +423,17 @@ private Element interpretElement0(
  namespace = "" and // TODO: Fill out when we properly extract modules.
  (
    // Non-member functions
-    exists(AbstractFunctionDecl func |
+    exists(Function func |
      func.getName() = name and
      type = "" and
      matchesSignature(func, signature) and
      subtypes = false and
-      not result instanceof MethodDecl and
+      not result instanceof Method and
      result = func
    )
    or
    // Member functions
-    exists(NominalTypeDecl namedTypeDecl, Decl declWithMethod, MethodDecl method |
+    exists(NominalTypeDecl namedTypeDecl, Decl declWithMethod, Method method |
      method.getName() = name and
      method = declWithMethod.getAMember() and
      namedTypeDecl.getFullName() = type and
--- a/swift/ql/lib/codeql/swift/dataflow/Ssa.qll
+++ b/swift/ql/lib/codeql/swift/dataflow/Ssa.qll
@@ -107,7 +107,7 @@ module Ssa {
        certain = true
      )
      or
-      exists(ExitNode exit, AbstractFunctionDecl func |
+      exists(ExitNode exit, Function func |
        [func.getAParam(), func.getSelfParam()] = v.asVarDecl() and
        bb.getNode(i) = exit and
        modifiableParam(v.asVarDecl()) and
--- a/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowDispatch.qll
+++ b/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowDispatch.qll
@@ -179,7 +179,7 @@ class PropertyGetterCall extends DataFlowCall, TPropertyGetterCall {

  override Location getLocation() { result = getter.getLocation() }

-  AccessorDecl getAccessorDecl() { result = getter.getAccessorDecl() }
+  Accessor getAccessor() { result = getter.getAccessor() }
 }

 class PropertySetterCall extends DataFlowCall, TPropertySetterCall {
@@ -203,7 +203,7 @@ class PropertySetterCall extends DataFlowCall, TPropertySetterCall {

  override Location getLocation() { result = setter.getLocation() }

-  AccessorDecl getAccessorDecl() { result = setter.getAccessorDecl() }
+  Accessor getAccessor() { result = setter.getAccessor() }
 }

 class PropertyObserverCall extends DataFlowCall, TPropertyObserverCall {
@@ -230,7 +230,7 @@ class PropertyObserverCall extends DataFlowCall, TPropertyObserverCall {

  override Location getLocation() { result = observer.getLocation() }

-  AccessorDecl getAccessorDecl() { result = observer.getAccessorDecl() }
+  Accessor getAccessor() { result = observer.getAccessor() }
 }

 class SummaryCall extends DataFlowCall, TSummaryCall {
@@ -261,11 +261,11 @@ private module Cached {
  DataFlowCallable viableCallable(DataFlowCall call) {
    result = TDataFlowFunc(call.asCall().getStaticTarget())
    or
-    result = TDataFlowFunc(call.(PropertyGetterCall).getAccessorDecl())
+    result = TDataFlowFunc(call.(PropertyGetterCall).getAccessor())
    or
-    result = TDataFlowFunc(call.(PropertySetterCall).getAccessorDecl())
+    result = TDataFlowFunc(call.(PropertySetterCall).getAccessor())
    or
-    result = TDataFlowFunc(call.(PropertyObserverCall).getAccessorDecl())
+    result = TDataFlowFunc(call.(PropertyObserverCall).getAccessor())
    or
    result = TSummarizedCallable(call.asCall().getStaticTarget())
  }
--- a/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll
+++ b/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll
@@ -187,7 +187,7 @@ private module Cached {
    or
    // flow through nil-coalescing operator `??`
    exists(BinaryExpr nco |
-      nco.getOperator().(FreeFunctionDecl).getName() = "??(_:_:)" and
+      nco.getOperator().(FreeFunction).getName() = "??(_:_:)" and
      nodeTo.asExpr() = nco
    |
      // value argument
@@ -487,12 +487,12 @@ private module ReturnNodes {
  }

  /**
-   * A data-flow node that represents the `self` value in a constructor being
+   * A data-flow node that represents the `self` value in an initializer being
   * implicitly returned as the newly-constructed object
   */
  class SelfReturnNode extends InoutReturnNodeImpl {
    SelfReturnNode() {
-      exit.getScope() instanceof ConstructorDecl and
+      exit.getScope() instanceof Initializer and
      param instanceof SelfParamDecl
    }

@@ -688,7 +688,7 @@ predicate storeStep(Node node1, ContentSet c, Node node2) {
  )
  or
  // creation of an optional by returning from a failable initializer (`init?`)
-  exists(ConstructorDecl init |
+  exists(Initializer init |
    node1.asExpr().(CallExpr).getStaticTarget() = init and
    node2 = node1 and // HACK: again, we should ideally have a separate Node case here, and not reuse the CallExpr
    c instanceof OptionalSomeContentSet and
--- a/swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImplSpecific.qll
+++ b/swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImplSpecific.qll
@@ -13,7 +13,7 @@ private import codeql.swift.dataflow.ExternalFlow
 private import codeql.swift.dataflow.FlowSummary as FlowSummary
 private import codeql.swift.controlflow.CfgNodes

-class SummarizedCallableBase = AbstractFunctionDecl;
+class SummarizedCallableBase = Function;

 DataFlowCallable inject(SummarizedCallable c) { result.getUnderlyingCallable() = c }

@@ -58,9 +58,7 @@ DataFlowType getSyntheticGlobalType(SummaryComponent::SyntheticGlobal sg) { any(
 * Holds if an external flow summary exists for `c` with input specification
 * `input`, output specification `output`, kind `kind`, and provenance `provenance`.
 */
-predicate summaryElement(
-  AbstractFunctionDecl c, string input, string output, string kind, string provenance
-) {
+predicate summaryElement(Function c, string input, string output, string kind, string provenance) {
  exists(
    string namespace, string type, boolean subtypes, string name, string signature, string ext
  |
@@ -73,7 +71,7 @@ predicate summaryElement(
 * Holds if a neutral model exists for `c` with provenance `provenance`,
 * which means that there is no flow through `c`.
 */
-predicate neutralElement(AbstractFunctionDecl c, string provenance) { none() }
+predicate neutralElement(Function c, string provenance) { none() }

 /**
 * Holds if an external source specification exists for `e` with output specification
@@ -167,7 +165,7 @@ class InterpretNode extends TInterpretNode {
  DataFlowCallable asCallable() { result.getUnderlyingCallable() = this.asElement() }

  /** Gets the target of this call, if any. */
-  AbstractFunctionDecl getCallTarget() { result = this.asCall().asCall().getStaticTarget() }
+  Function getCallTarget() { result = this.asCall().asCall().getStaticTarget() }

  /** Gets a textual representation of this node. */
  string toString() {
--- a/swift/ql/lib/codeql/swift/elements.qll
+++ b/swift/ql/lib/codeql/swift/elements.qll
@@ -18,31 +18,30 @@ import codeql.swift.elements.PlatformVersionAvailabilitySpec
 import codeql.swift.elements.UnknownFile
 import codeql.swift.elements.UnknownLocation
 import codeql.swift.elements.UnspecifiedElement
-import codeql.swift.elements.decl.AbstractFunctionDecl
 import codeql.swift.elements.decl.AbstractStorageDecl
 import codeql.swift.elements.decl.AbstractTypeParamDecl
-import codeql.swift.elements.decl.AccessorDecl
+import codeql.swift.elements.decl.Accessor
 import codeql.swift.elements.decl.AssociatedTypeDecl
 import codeql.swift.elements.decl.CapturedDecl
 import codeql.swift.elements.decl.ClassDecl
-import codeql.swift.elements.decl.ConcreteFuncDecl
 import codeql.swift.elements.decl.ConcreteVarDecl
-import codeql.swift.elements.decl.ConstructorDecl
 import codeql.swift.elements.decl.Decl
-import codeql.swift.elements.decl.DestructorDecl
+import codeql.swift.elements.decl.Deinitializer
 import codeql.swift.elements.decl.EnumCaseDecl
 import codeql.swift.elements.decl.EnumDecl
 import codeql.swift.elements.decl.EnumElementDecl
 import codeql.swift.elements.decl.ExtensionDecl
-import codeql.swift.elements.decl.FuncDecl
+import codeql.swift.elements.decl.Function
 import codeql.swift.elements.decl.GenericContext
 import codeql.swift.elements.decl.GenericTypeDecl
 import codeql.swift.elements.decl.GenericTypeParamDecl
 import codeql.swift.elements.decl.IfConfigDecl
 import codeql.swift.elements.decl.ImportDecl
 import codeql.swift.elements.decl.InfixOperatorDecl
+import codeql.swift.elements.decl.Initializer
 import codeql.swift.elements.decl.MissingMemberDecl
 import codeql.swift.elements.decl.ModuleDecl
+import codeql.swift.elements.decl.NamedFunction
 import codeql.swift.elements.decl.NominalTypeDecl
 import codeql.swift.elements.decl.OpaqueTypeDecl
 import codeql.swift.elements.decl.OperatorDecl
@@ -61,7 +60,6 @@ import codeql.swift.elements.decl.TypeDecl
 import codeql.swift.elements.decl.ValueDecl
 import codeql.swift.elements.decl.VarDecl
 import codeql.swift.elements.expr.AbiSafeConversionExpr
-import codeql.swift.elements.expr.AbstractClosureExpr
 import codeql.swift.elements.expr.AnyHashableErasureExpr
 import codeql.swift.elements.expr.AnyTryExpr
 import codeql.swift.elements.expr.AppliedPropertyWrapperExpr
@@ -89,7 +87,6 @@ import codeql.swift.elements.expr.CollectionExpr
 import codeql.swift.elements.expr.CollectionUpcastConversionExpr
 import codeql.swift.elements.expr.ConditionalBridgeFromObjCExpr
 import codeql.swift.elements.expr.ConditionalCheckedCastExpr
-import codeql.swift.elements.expr.ConstructorRefCallExpr
 import codeql.swift.elements.expr.CovariantFunctionConversionExpr
 import codeql.swift.elements.expr.CovariantReturnConversionExpr
 import codeql.swift.elements.expr.DeclRefExpr
@@ -102,7 +99,6 @@ import codeql.swift.elements.expr.DifferentiableFunctionExtractOriginalExpr
 import codeql.swift.elements.expr.DiscardAssignmentExpr
 import codeql.swift.elements.expr.DotSelfExpr
 import codeql.swift.elements.expr.DotSyntaxBaseIgnoredExpr
-import codeql.swift.elements.expr.DotSyntaxCallExpr
 import codeql.swift.elements.expr.DynamicLookupExpr
 import codeql.swift.elements.expr.DynamicMemberRefExpr
 import codeql.swift.elements.expr.DynamicSubscriptExpr
@@ -112,6 +108,7 @@ import codeql.swift.elements.expr.ErasureExpr
 import codeql.swift.elements.expr.ErrorExpr
 import codeql.swift.elements.expr.ExistentialMetatypeToObjectExpr
 import codeql.swift.elements.expr.ExplicitCastExpr
+import codeql.swift.elements.expr.ExplicitClosureExpr
 import codeql.swift.elements.expr.Expr
 import codeql.swift.elements.expr.FloatLiteralExpr
 import codeql.swift.elements.expr.ForceTryExpr
@@ -131,7 +128,7 @@ import codeql.swift.elements.expr.IsExpr
 import codeql.swift.elements.expr.KeyPathApplicationExpr
 import codeql.swift.elements.expr.KeyPathDotExpr
 import codeql.swift.elements.expr.KeyPathExpr
-import codeql.swift.elements.expr.LazyInitializerExpr
+import codeql.swift.elements.expr.LazyInitializationExpr
 import codeql.swift.elements.expr.LinearFunctionExpr
 import codeql.swift.elements.expr.LinearFunctionExtractOriginalExpr
 import codeql.swift.elements.expr.LinearToDifferentiableFunctionExpr
@@ -152,7 +149,7 @@ import codeql.swift.elements.expr.OpaqueValueExpr
 import codeql.swift.elements.expr.OpenExistentialExpr
 import codeql.swift.elements.expr.OptionalEvaluationExpr
 import codeql.swift.elements.expr.OptionalTryExpr
-import codeql.swift.elements.expr.OtherConstructorDeclRefExpr
+import codeql.swift.elements.expr.OtherInitializerRefExpr
 import codeql.swift.elements.expr.OverloadedDeclRefExpr
 import codeql.swift.elements.expr.ParenExpr
 import codeql.swift.elements.expr.PointerToPointerExpr
@@ -160,7 +157,7 @@ import codeql.swift.elements.expr.PostfixUnaryExpr
 import codeql.swift.elements.expr.PrefixUnaryExpr
 import codeql.swift.elements.expr.PropertyWrapperValuePlaceholderExpr
 import codeql.swift.elements.expr.ProtocolMetatypeToObjectExpr
-import codeql.swift.elements.expr.RebindSelfInConstructorExpr
+import codeql.swift.elements.expr.RebindSelfInInitializerExpr
 import codeql.swift.elements.expr.RegexLiteralExpr
 import codeql.swift.elements.expr.SequenceExpr
 import codeql.swift.elements.expr.StringLiteralExpr
--- a/swift/ql/lib/codeql/swift/elements/AstNode.qll
+++ b/swift/ql/lib/codeql/swift/elements/AstNode.qll
@@ -1,7 +1,7 @@
 private import codeql.swift.generated.AstNode
-private import codeql.swift.elements.decl.AbstractFunctionDecl
+private import codeql.swift.elements.decl.Function
 private import codeql.swift.elements.decl.Decl
-private import codeql.swift.elements.expr.AbstractClosureExpr
+private import codeql.swift.elements.expr.ClosureExpr
 private import codeql.swift.elements.Callable
 private import codeql.swift.generated.ParentChild

@@ -15,12 +15,12 @@ private module Cached {
  Decl getEnclosingDecl(AstNode ast) { result = getEnclosingDeclStep*(getImmediateParent(ast)) }

  private Element getEnclosingFunctionStep(Element e) {
-    not e instanceof AbstractFunctionDecl and
+    not e instanceof Function and
    result = getEnclosingDecl(e)
  }

  cached
-  AbstractFunctionDecl getEnclosingFunction(AstNode ast) {
+  Function getEnclosingFunction(AstNode ast) {
    result = getEnclosingFunctionStep*(getEnclosingDecl(ast))
  }

@@ -30,7 +30,7 @@ private module Cached {
  }

  cached
-  AbstractClosureExpr getEnclosingClosure(AstNode ast) {
+  ClosureExpr getEnclosingClosure(AstNode ast) {
    result = getEnclosingClosureStep*(getImmediateParent(ast))
  }
 }
@@ -53,7 +53,7 @@ class AstNode extends Generated::AstNode {
   * }
   * ```
   */
-  final AbstractFunctionDecl getEnclosingFunction() { result = Cached::getEnclosingFunction(this) }
+  final Function getEnclosingFunction() { result = Cached::getEnclosingFunction(this) }

  /**
   * Gets the nearest declaration that contains this AST node, if any.
--- a/swift/ql/lib/codeql/swift/elements/decl/AbstractFunctionDecl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/AbstractFunctionDecl.qll
@@ -1,16 +0,0 @@
-private import codeql.swift.generated.decl.AbstractFunctionDecl
-private import codeql.swift.elements.decl.MethodDecl
-
-/**
- * A function.
- */
-class AbstractFunctionDecl extends Generated::AbstractFunctionDecl, Callable {
-  override string toString() { result = this.getName() }
-}
-
-/**
- * A free (non-member) function.
- */
-class FreeFunctionDecl extends AbstractFunctionDecl {
-  FreeFunctionDecl() { not this instanceof MethodDecl }
-}
--- a/swift/ql/lib/codeql/swift/elements/decl/AccessorDecl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/AccessorDecl.qll
@@ -1,6 +1,6 @@
-private import codeql.swift.generated.decl.AccessorDecl
+private import codeql.swift.generated.decl.Accessor

-private predicate isKnownAccessorKind(AccessorDecl decl, string kind) {
+private predicate isKnownAccessorKind(Accessor decl, string kind) {
  decl.isGetter() and kind = "get"
  or
  decl.isSetter() and kind = "set"
@@ -18,7 +18,7 @@ private predicate isKnownAccessorKind(AccessorDecl decl, string kind) {
  decl.isUnsafeMutableAddress() and kind = "unsafeMutableAddress"
 }

-class AccessorDecl extends Generated::AccessorDecl {
+class Accessor extends Generated::Accessor {
  predicate isPropertyObserver() {
    this instanceof WillSetObserver or this instanceof DidSetObserver
  }
@@ -31,10 +31,10 @@ class AccessorDecl extends Generated::AccessorDecl {
  }
 }

-class WillSetObserver extends AccessorDecl {
+class WillSetObserver extends Accessor {
  WillSetObserver() { this.isWillSet() }
 }

-class DidSetObserver extends AccessorDecl {
+class DidSetObserver extends Accessor {
  DidSetObserver() { this.isDidSet() }
 }
--- a/swift/ql/lib/codeql/swift/elements/expr/ClosureExprConstructor.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/ClosureExprConstructor.qll
@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.Raw

-predicate constructClosureExpr(Raw::ClosureExpr id) { any() }
+predicate constructAccessor(Raw::Accessor id) { any() }
--- a/swift/ql/lib/codeql/swift/elements/decl/AccessorOrNamedFunction.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/AccessorOrNamedFunction.qll
@@ -0,0 +1,4 @@
+// generated by codegen/codegen.py, remove this comment if you wish to edit this file
+private import codeql.swift.generated.decl.AccessorOrNamedFunction
+
+class AccessorOrNamedFunction extends Generated::AccessorOrNamedFunction { }
--- a/swift/ql/lib/codeql/swift/elements/decl/ConcreteFuncDecl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/ConcreteFuncDecl.qll
@@ -1,4 +0,0 @@
-// generated by codegen/codegen.py, remove this comment if you wish to edit this file
-private import codeql.swift.generated.decl.ConcreteFuncDecl
-
-class ConcreteFuncDecl extends Generated::ConcreteFuncDecl { }
--- a/swift/ql/lib/codeql/swift/elements/decl/Deinitializer.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/Deinitializer.qll
@@ -0,0 +1,9 @@
+private import codeql.swift.generated.decl.Deinitializer
+private import codeql.swift.elements.decl.Method
+
+/**
+ * A deinitializer of a class.
+ */
+class Deinitializer extends Generated::Deinitializer, Method {
+  override string toString() { result = this.getSelfParam().getType() + "." + super.toString() }
+}
--- a/swift/ql/lib/codeql/swift/elements/decl/DestructorDeclConstructor.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/DestructorDeclConstructor.qll
@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.Raw

-predicate constructDestructorDecl(Raw::DestructorDecl id) { any() }
+predicate constructDeinitializer(Raw::Deinitializer id) { any() }
--- a/swift/ql/lib/codeql/swift/elements/decl/DestructorDecl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/DestructorDecl.qll
@@ -1,9 +0,0 @@
-private import codeql.swift.generated.decl.DestructorDecl
-private import codeql.swift.elements.decl.MethodDecl
-
-/**
- * A deinitializer of a class.
- */
-class DestructorDecl extends Generated::DestructorDecl, MethodDecl {
-  override string toString() { result = this.getSelfParam().getType() + "." + super.toString() }
-}
--- a/swift/ql/lib/codeql/swift/elements/decl/FuncDecl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/FuncDecl.qll
@@ -1,4 +0,0 @@
-// generated by codegen/codegen.py, remove this comment if you wish to edit this file
-private import codeql.swift.generated.decl.FuncDecl
-
-class FuncDecl extends Generated::FuncDecl { }
--- a/swift/ql/lib/codeql/swift/elements/decl/Function.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/Function.qll
@@ -0,0 +1,16 @@
+private import codeql.swift.generated.decl.Function
+private import codeql.swift.elements.decl.Method
+
+/**
+ * A function.
+ */
+class Function extends Generated::Function, Callable {
+  override string toString() { result = this.getName() }
+}
+
+/**
+ * A free (non-member) function.
+ */
+class FreeFunction extends Function {
+  FreeFunction() { not this instanceof Method }
+}
--- a/swift/ql/lib/codeql/swift/elements/decl/ConstructorDecl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/ConstructorDecl.qll
@@ -1,12 +1,12 @@
-private import codeql.swift.generated.decl.ConstructorDecl
-private import codeql.swift.elements.decl.MethodDecl
+private import codeql.swift.generated.decl.Initializer
+private import codeql.swift.elements.decl.Method
 private import codeql.swift.elements.type.FunctionType
 private import codeql.swift.elements.type.OptionalType

 /**
 * An initializer of a class, struct, enum or protocol.
 */
-class ConstructorDecl extends Generated::ConstructorDecl, MethodDecl {
+class Initializer extends Generated::Initializer, Method {
  override string toString() { result = this.getSelfParam().getType() + "." + super.toString() }

  /** Holds if this initializer returns an optional type. Failable initializers are written as `init?`. */
--- a/swift/ql/lib/codeql/swift/elements/decl/AccessorDeclConstructor.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/AccessorDeclConstructor.qll
@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.Raw

-predicate constructAccessorDecl(Raw::AccessorDecl id) { any() }
+predicate constructInitializer(Raw::Initializer id) { any() }
--- a/swift/ql/lib/codeql/swift/elements/decl/MethodDecl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/MethodDecl.qll
@@ -5,15 +5,15 @@ private Decl getAMember(Decl ctx) {
  or
  exists(VarDecl var |
    ctx.getAMember() = var and
-    var.getAnAccessorDecl() = result
+    var.getAnAccessor() = result
  )
 }

 /**
 * A function that is a member of a class, struct, enum or protocol.
 */
-class MethodDecl extends AbstractFunctionDecl {
-  MethodDecl() {
+class Method extends Function {
+  Method() {
    this = getAMember(any(ClassDecl c))
    or
    this = getAMember(any(StructDecl c))
--- a/swift/ql/lib/codeql/swift/elements/decl/NamedFunction.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/NamedFunction.qll
@@ -0,0 +1,4 @@
+// generated by codegen/codegen.py, remove this comment if you wish to edit this file
+private import codeql.swift.generated.decl.NamedFunction
+
+class NamedFunction extends Generated::NamedFunction { }
--- a/swift/ql/lib/codeql/swift/elements/decl/ConstructorDeclConstructor.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/ConstructorDeclConstructor.qll
@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.Raw

-predicate constructConstructorDecl(Raw::ConstructorDecl id) { any() }
+predicate constructNamedFunction(Raw::NamedFunction id) { any() }
--- a/swift/ql/lib/codeql/swift/elements/expr/AbstractClosureExpr.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/AbstractClosureExpr.qll
@@ -1,4 +0,0 @@
-// generated by codegen/codegen.py, remove this comment if you wish to edit this file
-private import codeql.swift.generated.expr.AbstractClosureExpr
-
-class AbstractClosureExpr extends Generated::AbstractClosureExpr { }
--- a/swift/ql/lib/codeql/swift/elements/expr/ApplyExpr.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/ApplyExpr.qll
@@ -4,7 +4,7 @@ private import codeql.swift.elements.expr.DeclRefExpr
 private import codeql.swift.elements.expr.MethodLookupExpr
 private import codeql.swift.elements.expr.DotSyntaxBaseIgnoredExpr
 private import codeql.swift.elements.expr.AutoClosureExpr
-private import codeql.swift.elements.decl.MethodDecl
+private import codeql.swift.elements.decl.Method

 class ApplyExpr extends Generated::ApplyExpr {
  Callable getStaticTarget() { result = this.getFunction().(DeclRefExpr).getDecl() }
@@ -33,7 +33,7 @@ class MethodApplyExpr extends ApplyExpr {

  MethodApplyExpr() { method = this.getFunction() }

-  override MethodDecl getStaticTarget() { result = method.getMethod() }
+  override Method getStaticTarget() { result = method.getMethod() }

  override Expr getQualifier() { result = method.getBase() }
 }
--- a/swift/ql/lib/codeql/swift/elements/expr/BinaryExpr.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/BinaryExpr.qll
@@ -1,6 +1,6 @@
 private import codeql.swift.generated.expr.BinaryExpr
 private import codeql.swift.elements.expr.Expr
-private import codeql.swift.elements.decl.AbstractFunctionDecl
+private import codeql.swift.elements.decl.Function

 /**
 * A Swift binary expression, that is, an expression that appears between its
@@ -23,7 +23,7 @@ class BinaryExpr extends Generated::BinaryExpr {
  /**
   * Gets the operator of this binary expression (the function that is called).
   */
-  AbstractFunctionDecl getOperator() { result = this.getStaticTarget() }
+  Function getOperator() { result = this.getStaticTarget() }

  /**
   * Gets an operand of this binary expression (left or right).
@@ -32,5 +32,5 @@ class BinaryExpr extends Generated::BinaryExpr {

  override string toString() { result = "... " + this.getFunction().toString() + " ..." }

-  override AbstractFunctionDecl getStaticTarget() { result = super.getStaticTarget() }
+  override Function getStaticTarget() { result = super.getStaticTarget() }
 }
--- a/swift/ql/lib/codeql/swift/elements/expr/ConstructorRefCallExpr.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/ConstructorRefCallExpr.qll
@@ -1,4 +0,0 @@
-// generated by codegen/codegen.py, remove this comment if you wish to edit this file
-private import codeql.swift.generated.expr.ConstructorRefCallExpr
-
-class ConstructorRefCallExpr extends Generated::ConstructorRefCallExpr { }
--- a/swift/ql/lib/codeql/swift/elements/expr/DotSyntaxBaseIgnoredExpr.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/DotSyntaxBaseIgnoredExpr.qll
@@ -2,7 +2,7 @@ private import codeql.swift.generated.expr.DotSyntaxBaseIgnoredExpr
 private import codeql.swift.elements.expr.AutoClosureExpr
 private import codeql.swift.elements.expr.CallExpr
 private import codeql.swift.elements.expr.TypeExpr
-private import codeql.swift.elements.decl.MethodDecl
+private import codeql.swift.elements.decl.Method

 /**
 * An expression representing a partially applied lookup of an instance property via the receiver's type object.
@@ -28,7 +28,7 @@ class DotSyntaxBaseIgnoredExpr extends Generated::DotSyntaxBaseIgnoredExpr {
   * Gets the underlying instance method that is called when the result of this
   * expression is fully applied.
   */
-  MethodDecl getMethod() {
+  Method getMethod() {
    result =
      this.getSubExpr()
          .(AutoClosureExpr)
--- a/swift/ql/lib/codeql/swift/elements/expr/ExplicitClosureExpr.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/ExplicitClosureExpr.qll
@@ -0,0 +1,4 @@
+// generated by codegen/codegen.py, remove this comment if you wish to edit this file
+private import codeql.swift.generated.expr.ExplicitClosureExpr
+
+class ExplicitClosureExpr extends Generated::ExplicitClosureExpr { }
--- a/swift/ql/lib/codeql/swift/elements/expr/ExplicitClosureExprConstructor.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/ExplicitClosureExprConstructor.qll
@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.Raw

-predicate constructLazyInitializerExpr(Raw::LazyInitializerExpr id) { any() }
+predicate constructExplicitClosureExpr(Raw::ExplicitClosureExpr id) { any() }
--- a/swift/ql/lib/codeql/swift/elements/expr/InitializerCallExpr.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/InitializerCallExpr.qll
@@ -1,9 +1,9 @@
 private import codeql.swift.elements.expr.MethodCallExpr
 private import codeql.swift.elements.expr.InitializerLookupExpr
-private import codeql.swift.elements.decl.ConstructorDecl
+private import codeql.swift.elements.decl.Initializer

 class InitializerCallExpr extends MethodCallExpr {
  InitializerCallExpr() { this.getFunction() instanceof InitializerLookupExpr }

-  override ConstructorDecl getStaticTarget() { result = super.getStaticTarget() }
+  override Initializer getStaticTarget() { result = super.getStaticTarget() }
 }
--- a/swift/ql/lib/codeql/swift/elements/expr/InitializerLookupExpr.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/InitializerLookupExpr.qll
@@ -1,10 +1,10 @@
 private import codeql.swift.elements.expr.MethodLookupExpr
-private import codeql.swift.elements.decl.ConstructorDecl
+private import codeql.swift.elements.decl.Initializer

 class InitializerLookupExpr extends MethodLookupExpr {
-  InitializerLookupExpr() { super.getMethod() instanceof ConstructorDecl }
+  InitializerLookupExpr() { super.getMethod() instanceof Initializer }

-  override ConstructorDecl getMethod() { result = super.getMethod() }
+  override Initializer getMethod() { result = super.getMethod() }

  override string toString() { result = this.getMember().toString() }
 }
--- a/swift/ql/lib/codeql/swift/elements/expr/InitializerRefCallExpr.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/InitializerRefCallExpr.qll
@@ -0,0 +1,4 @@
+// generated by codegen/codegen.py, remove this comment if you wish to edit this file
+private import codeql.swift.generated.expr.InitializerRefCallExpr
+
+class InitializerRefCallExpr extends Generated::InitializerRefCallExpr { }
--- a/swift/ql/lib/codeql/swift/elements/expr/InitializerRefCallExprConstructor.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/InitializerRefCallExprConstructor.qll
@@ -1,3 +1,3 @@
 private import codeql.swift.generated.Raw

-predicate constructConstructorRefCallExpr(Raw::ConstructorRefCallExpr id) { none() }
+predicate constructInitializerRefCallExpr(Raw::InitializerRefCallExpr id) { none() }
--- a/swift/ql/lib/codeql/swift/elements/expr/LazyInitializationExpr.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/LazyInitializationExpr.qll
@@ -0,0 +1,5 @@
+private import codeql.swift.generated.expr.LazyInitializationExpr
+
+class LazyInitializationExpr extends Generated::LazyInitializationExpr {
+  override string toString() { result = this.getSubExpr().toString() }
+}
--- a/swift/ql/lib/codeql/swift/elements/expr/LazyInitializationExprConstructor.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/LazyInitializationExprConstructor.qll
@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.Raw

-predicate constructConcreteFuncDecl(Raw::ConcreteFuncDecl id) { any() }
+predicate constructLazyInitializationExpr(Raw::LazyInitializationExpr id) { any() }
--- a/swift/ql/lib/codeql/swift/elements/expr/LazyInitializerExpr.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/LazyInitializerExpr.qll
@@ -1,5 +0,0 @@
-private import codeql.swift.generated.expr.LazyInitializerExpr
-
-class LazyInitializerExpr extends Generated::LazyInitializerExpr {
-  override string toString() { result = this.getSubExpr().toString() }
-}
--- a/swift/ql/lib/codeql/swift/elements/expr/LogicalOperation.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/LogicalOperation.qll
@@ -3,7 +3,6 @@ private import codeql.swift.elements.expr.BinaryExpr
 private import codeql.swift.elements.expr.PrefixUnaryExpr
 private import codeql.swift.elements.expr.DotSyntaxCallExpr
 private import codeql.swift.elements.expr.DeclRefExpr
-private import codeql.swift.elements.decl.ConcreteFuncDecl

 private predicate unaryHasName(PrefixUnaryExpr e, string name) {
  e.getStaticTarget().getName() = name
--- a/swift/ql/lib/codeql/swift/elements/expr/MethodLookupExpr.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/MethodLookupExpr.qll
@@ -1,9 +1,9 @@
 private import codeql.swift.generated.expr.MethodLookupExpr
 private import codeql.swift.elements.expr.MethodLookupExprConstructor
 private import codeql.swift.elements.expr.DeclRefExpr
-private import codeql.swift.elements.expr.OtherConstructorDeclRefExpr
+private import codeql.swift.elements.expr.OtherInitializerRefExpr
 private import codeql.swift.elements.decl.Decl
-private import codeql.swift.elements.decl.MethodDecl
+private import codeql.swift.elements.decl.Method
 private import codeql.swift.generated.Raw
 private import codeql.swift.generated.Synth

@@ -17,14 +17,14 @@ class MethodLookupExpr extends Generated::MethodLookupExpr {
  override Decl getImmediateMember() {
    result = this.getMethodRef().(DeclRefExpr).getDecl()
    or
-    result = this.getMethodRef().(OtherConstructorDeclRefExpr).getConstructorDecl()
+    result = this.getMethodRef().(OtherInitializerRefExpr).getInitializer()
  }

  override Expr getImmediateMethodRef() {
    result = Synth::convertExprFromRaw(this.getUnderlying().getFunction())
  }

-  MethodDecl getMethod() { result = this.getMember() }
+  Method getMethod() { result = this.getMember() }

  cached
  private Raw::SelfApplyExpr getUnderlying() { this = Synth::TMethodLookupExpr(result) }
--- a/swift/ql/lib/codeql/swift/elements/expr/OtherConstructorDeclRefExpr.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/OtherConstructorDeclRefExpr.qll
@@ -1,5 +0,0 @@
-private import codeql.swift.generated.expr.OtherConstructorDeclRefExpr
-
-class OtherConstructorDeclRefExpr extends Generated::OtherConstructorDeclRefExpr {
-  override string toString() { result = this.getConstructorDecl().toString() }
-}
--- a/swift/ql/lib/codeql/swift/elements/expr/OtherConstructorDeclRefExprConstructor.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/OtherConstructorDeclRefExprConstructor.qll
@@ -1,4 +0,0 @@
-// generated by codegen/codegen.py, remove this comment if you wish to edit this file
-private import codeql.swift.generated.Raw
-
-predicate constructOtherConstructorDeclRefExpr(Raw::OtherConstructorDeclRefExpr id) { any() }
--- a/swift/ql/lib/codeql/swift/elements/expr/OtherInitializerRefExpr.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/OtherInitializerRefExpr.qll
@@ -0,0 +1,5 @@
+private import codeql.swift.generated.expr.OtherInitializerRefExpr
+
+class OtherInitializerRefExpr extends Generated::OtherInitializerRefExpr {
+  override string toString() { result = this.getInitializer().toString() }
+}
--- a/swift/ql/lib/codeql/swift/elements/expr/OtherInitializerRefExprConstructor.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/OtherInitializerRefExprConstructor.qll
@@ -0,0 +1,4 @@
+// generated by codegen/codegen.py, remove this comment if you wish to edit this file
+private import codeql.swift.generated.Raw
+
+predicate constructOtherInitializerRefExpr(Raw::OtherInitializerRefExpr id) { any() }
--- a/swift/ql/lib/codeql/swift/elements/expr/PostfixUnaryExpr.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/PostfixUnaryExpr.qll
@@ -1,6 +1,6 @@
 private import codeql.swift.generated.expr.PostfixUnaryExpr
 private import codeql.swift.elements.expr.Expr
-private import codeql.swift.elements.decl.AbstractFunctionDecl
+private import codeql.swift.elements.decl.Function

 /**
 * A Swift postfix unary expression, that is, a unary expression that appears
@@ -18,5 +18,5 @@ class PostfixUnaryExpr extends Generated::PostfixUnaryExpr {
  /**
   * Gets the operator of this postfix unary expression (the function that is called).
   */
-  AbstractFunctionDecl getOperator() { result = this.getStaticTarget() }
+  Function getOperator() { result = this.getStaticTarget() }
 }
--- a/swift/ql/lib/codeql/swift/elements/expr/PrefixUnaryExpr.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/PrefixUnaryExpr.qll
@@ -1,6 +1,6 @@
 private import codeql.swift.generated.expr.PrefixUnaryExpr
 private import codeql.swift.elements.expr.Expr
-private import codeql.swift.elements.decl.AbstractFunctionDecl
+private import codeql.swift.elements.decl.Function

 /**
 * A Swift prefix unary expression, that is, a unary expression that appears
@@ -18,7 +18,7 @@ class PrefixUnaryExpr extends Generated::PrefixUnaryExpr {
  /**
   * Gets the operator of this prefix unary expression (the function that is called).
   */
-  AbstractFunctionDecl getOperator() { result = this.getStaticTarget() }
+  Function getOperator() { result = this.getStaticTarget() }

-  override AbstractFunctionDecl getStaticTarget() { result = super.getStaticTarget() }
+  override Function getStaticTarget() { result = super.getStaticTarget() }
 }
--- a/swift/ql/lib/codeql/swift/elements/expr/RebindSelfInConstructorExpr.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/RebindSelfInConstructorExpr.qll
@@ -1,5 +0,0 @@
-private import codeql.swift.generated.expr.RebindSelfInConstructorExpr
-
-class RebindSelfInConstructorExpr extends Generated::RebindSelfInConstructorExpr {
-  override string toString() { result = "self = ..." }
-}
--- a/swift/ql/lib/codeql/swift/elements/expr/RebindSelfInConstructorExprConstructor.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/RebindSelfInConstructorExprConstructor.qll
@@ -1,4 +0,0 @@
-// generated by codegen/codegen.py, remove this comment if you wish to edit this file
-private import codeql.swift.generated.Raw
-
-predicate constructRebindSelfInConstructorExpr(Raw::RebindSelfInConstructorExpr id) { any() }
--- a/swift/ql/lib/codeql/swift/elements/expr/RebindSelfInInitializerExpr.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/RebindSelfInInitializerExpr.qll
@@ -0,0 +1,5 @@
+private import codeql.swift.generated.expr.RebindSelfInInitializerExpr
+
+class RebindSelfInInitializerExpr extends Generated::RebindSelfInInitializerExpr {
+  override string toString() { result = "self = ..." }
+}
--- a/swift/ql/lib/codeql/swift/elements/expr/RebindSelfInInitializerExprConstructor.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/RebindSelfInInitializerExprConstructor.qll
@@ -0,0 +1,4 @@
+// generated by codegen/codegen.py, remove this comment if you wish to edit this file
+private import codeql.swift.generated.Raw
+
+predicate constructRebindSelfInInitializerExpr(Raw::RebindSelfInInitializerExpr id) { any() }
--- a/swift/ql/lib/codeql/swift/elements/expr/SelfRefExpr.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/SelfRefExpr.qll
@@ -1,14 +1,14 @@
 private import codeql.swift.elements.expr.DeclRefExpr
-private import codeql.swift.elements.decl.MethodDecl
+private import codeql.swift.elements.decl.Method
 private import codeql.swift.elements.decl.VarDecl

 /** A reference to `self`. */
 class SelfRefExpr extends DeclRefExpr {
-  MethodDecl methodDecl;
+  Method method;

-  SelfRefExpr() { this.getDecl() = methodDecl.getSelfParam() }
+  SelfRefExpr() { this.getDecl() = method.getSelfParam() }

  VarDecl getSelf() { result = this.getDecl() }

-  MethodDecl getDeclaringMethod() { result = methodDecl }
+  Method getDeclaringMethod() { result = method }
 }
--- a/swift/ql/lib/codeql/swift/elements/expr/SuperRefExpr.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/SuperRefExpr.qll
@@ -1,9 +1,9 @@
 private import codeql.swift.generated.expr.SuperRefExpr
-private import codeql.swift.elements.decl.MethodDecl
+private import codeql.swift.elements.decl.Method

 /** A reference to `super`. */
 class SuperRefExpr extends Generated::SuperRefExpr {
  override string toString() { result = "super" }

-  MethodDecl getDeclaringMethod() { this.getSelf() = result.getSelfParam() }
+  Method getDeclaringMethod() { this.getSelf() = result.getSelfParam() }
 }
--- a/swift/ql/lib/codeql/swift/frameworks/AEXML.qll
+++ b/swift/ql/lib/codeql/swift/frameworks/AEXML.qll
@@ -7,21 +7,21 @@ import swift
 /** The creation of an `AEXMLParser`. */
 class AexmlParser extends ApplyExpr {
  AexmlParser() {
-    this.getStaticTarget().(ConstructorDecl).getEnclosingDecl() instanceof AexmlParserDecl
+    this.getStaticTarget().(Initializer).getEnclosingDecl() instanceof AexmlParserDecl
  }
 }

 /** The creation of an `AEXMLDocument`. */
 class AexmlDocument extends ApplyExpr {
  AexmlDocument() {
-    this.getStaticTarget().(ConstructorDecl).getEnclosingDecl() instanceof AexmlDocumentDecl
+    this.getStaticTarget().(Initializer).getEnclosingDecl() instanceof AexmlDocumentDecl
  }
 }

 /** A call to `AEXMLDocument.loadXML(_:)`. */
 class AexmlDocumentLoadXml extends MethodApplyExpr {
  AexmlDocumentLoadXml() {
-    exists(MethodDecl f |
+    exists(Method f |
      this.getStaticTarget() = f and
      f.hasName("loadXML(_:)") and
      f.getEnclosingDecl() instanceof AexmlDocumentDecl
--- a/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/CustomUrlSchemes.qll
+++ b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/CustomUrlSchemes.qll
@@ -51,7 +51,7 @@ private class UrlLaunchOptionsRemoteFlowSource extends RemoteFlowSource {
  }
 }

-private class ApplicationWithLaunchOptionsFunc extends FuncDecl {
+private class ApplicationWithLaunchOptionsFunc extends Function {
  ApplicationWithLaunchOptionsFunc() {
    this.getName() = "application(_:" + ["did", "will"] + "FinishLaunchingWithOptions:)" and
    this.getEnclosingDecl().(ClassOrStructDecl).getABaseTypeDecl*().(ProtocolDecl).getName() =
--- a/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/WebView.qll
+++ b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/WebView.qll
@@ -57,7 +57,7 @@ private class AdoptsWkNavigationDelegate extends Decl {
 */
 private class WKNavigationDelegateSource extends RemoteFlowSource {
  WKNavigationDelegateSource() {
-    exists(ParamDecl p, FuncDecl f, AdoptsWkNavigationDelegate t |
+    exists(ParamDecl p, Function f, AdoptsWkNavigationDelegate t |
      t.getAMember() = f and
      f.getName() =
        [
@@ -170,7 +170,7 @@ private class JsExportedType extends ClassOrStructDecl {
 */
 private class JsExportedSource extends RemoteFlowSource {
  JsExportedSource() {
-    exists(MethodDecl adopter, MethodDecl base |
+    exists(Method adopter, Method base |
      base.getEnclosingDecl() instanceof JsExportedProto and
      adopter.getEnclosingDecl() instanceof JsExportedType
    |
--- a/swift/ql/lib/codeql/swift/generated/ParentChild.qll
+++ b/swift/ql/lib/codeql/swift/generated/ParentChild.qll
@@ -1,5 +1,8 @@
 // generated by codegen/codegen.py
 import codeql.swift.elements
+import codeql.swift.elements.decl.AccessorOrNamedFunction
+import codeql.swift.elements.expr.DotSyntaxCallExpr
+import codeql.swift.elements.expr.InitializerRefCallExpr
 import codeql.swift.elements.expr.SelfApplyExpr

 private module Impl {
@@ -519,46 +522,21 @@ private module Impl {
    )
  }

-  private Element getImmediateChildOfAbstractFunctionDecl(
-    AbstractFunctionDecl e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bGenericContext, int bValueDecl, int bCallable, int n |
-      b = 0 and
-      bGenericContext =
-        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfGenericContext(e, i, _)) | i) and
-      bValueDecl =
-        bGenericContext + 1 +
-          max(int i | i = -1 or exists(getImmediateChildOfValueDecl(e, i, _)) | i) and
-      bCallable =
-        bValueDecl + 1 + max(int i | i = -1 or exists(getImmediateChildOfCallable(e, i, _)) | i) and
-      n = bCallable and
-      (
-        none()
-        or
-        result = getImmediateChildOfGenericContext(e, index - b, partialPredicateCall)
-        or
-        result = getImmediateChildOfValueDecl(e, index - bGenericContext, partialPredicateCall)
-        or
-        result = getImmediateChildOfCallable(e, index - bValueDecl, partialPredicateCall)
-      )
-    )
-  }
-
  private Element getImmediateChildOfAbstractStorageDecl(
    AbstractStorageDecl e, int index, string partialPredicateCall
  ) {
-    exists(int b, int bValueDecl, int n, int nAccessorDecl |
+    exists(int b, int bValueDecl, int n, int nAccessor |
      b = 0 and
      bValueDecl = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfValueDecl(e, i, _)) | i) and
      n = bValueDecl and
-      nAccessorDecl = n + 1 + max(int i | i = -1 or exists(e.getImmediateAccessorDecl(i)) | i) and
+      nAccessor = n + 1 + max(int i | i = -1 or exists(e.getImmediateAccessor(i)) | i) and
      (
        none()
        or
        result = getImmediateChildOfValueDecl(e, index - b, partialPredicateCall)
        or
-        result = e.getImmediateAccessorDecl(index - n) and
-        partialPredicateCall = "AccessorDecl(" + (index - n).toString() + ")"
+        result = e.getImmediateAccessor(index - n) and
+        partialPredicateCall = "Accessor(" + (index - n).toString() + ")"
      )
    )
  }
@@ -582,6 +560,29 @@ private module Impl {
    )
  }

+  private Element getImmediateChildOfFunction(Function e, int index, string partialPredicateCall) {
+    exists(int b, int bGenericContext, int bValueDecl, int bCallable, int n |
+      b = 0 and
+      bGenericContext =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfGenericContext(e, i, _)) | i) and
+      bValueDecl =
+        bGenericContext + 1 +
+          max(int i | i = -1 or exists(getImmediateChildOfValueDecl(e, i, _)) | i) and
+      bCallable =
+        bValueDecl + 1 + max(int i | i = -1 or exists(getImmediateChildOfCallable(e, i, _)) | i) and
+      n = bCallable and
+      (
+        none()
+        or
+        result = getImmediateChildOfGenericContext(e, index - b, partialPredicateCall)
+        or
+        result = getImmediateChildOfValueDecl(e, index - bGenericContext, partialPredicateCall)
+        or
+        result = getImmediateChildOfCallable(e, index - bValueDecl, partialPredicateCall)
+      )
+    )
+  }
+
  private Element getImmediateChildOfInfixOperatorDecl(
    InfixOperatorDecl e, int index, string partialPredicateCall
  ) {
@@ -658,48 +659,32 @@ private module Impl {
    )
  }

-  private Element getImmediateChildOfConstructorDecl(
-    ConstructorDecl e, int index, string partialPredicateCall
+  private Element getImmediateChildOfAccessorOrNamedFunction(
+    AccessorOrNamedFunction e, int index, string partialPredicateCall
  ) {
-    exists(int b, int bAbstractFunctionDecl, int n |
+    exists(int b, int bFunction, int n |
      b = 0 and
-      bAbstractFunctionDecl =
-        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAbstractFunctionDecl(e, i, _)) | i) and
-      n = bAbstractFunctionDecl and
+      bFunction = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfFunction(e, i, _)) | i) and
+      n = bFunction and
      (
        none()
        or
-        result = getImmediateChildOfAbstractFunctionDecl(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfFunction(e, index - b, partialPredicateCall)
      )
    )
  }

-  private Element getImmediateChildOfDestructorDecl(
-    DestructorDecl e, int index, string partialPredicateCall
+  private Element getImmediateChildOfDeinitializer(
+    Deinitializer e, int index, string partialPredicateCall
  ) {
-    exists(int b, int bAbstractFunctionDecl, int n |
+    exists(int b, int bFunction, int n |
      b = 0 and
-      bAbstractFunctionDecl =
-        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAbstractFunctionDecl(e, i, _)) | i) and
-      n = bAbstractFunctionDecl and
+      bFunction = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfFunction(e, i, _)) | i) and
+      n = bFunction and
      (
        none()
        or
-        result = getImmediateChildOfAbstractFunctionDecl(e, index - b, partialPredicateCall)
-      )
-    )
-  }
-
-  private Element getImmediateChildOfFuncDecl(FuncDecl e, int index, string partialPredicateCall) {
-    exists(int b, int bAbstractFunctionDecl, int n |
-      b = 0 and
-      bAbstractFunctionDecl =
-        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAbstractFunctionDecl(e, i, _)) | i) and
-      n = bAbstractFunctionDecl and
-      (
-        none()
-        or
-        result = getImmediateChildOfAbstractFunctionDecl(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfFunction(e, index - b, partialPredicateCall)
      )
    )
  }
@@ -725,6 +710,21 @@ private module Impl {
    )
  }

+  private Element getImmediateChildOfInitializer(
+    Initializer e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bFunction, int n |
+      b = 0 and
+      bFunction = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfFunction(e, i, _)) | i) and
+      n = bFunction and
+      (
+        none()
+        or
+        result = getImmediateChildOfFunction(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
  private Element getImmediateChildOfModuleDecl(ModuleDecl e, int index, string partialPredicateCall) {
    exists(int b, int bTypeDecl, int n |
      b = 0 and
@@ -802,17 +802,17 @@ private module Impl {
    )
  }

-  private Element getImmediateChildOfAccessorDecl(
-    AccessorDecl e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bFuncDecl, int n |
+  private Element getImmediateChildOfAccessor(Accessor e, int index, string partialPredicateCall) {
+    exists(int b, int bAccessorOrNamedFunction, int n |
      b = 0 and
-      bFuncDecl = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfFuncDecl(e, i, _)) | i) and
-      n = bFuncDecl and
+      bAccessorOrNamedFunction =
+        b + 1 +
+          max(int i | i = -1 or exists(getImmediateChildOfAccessorOrNamedFunction(e, i, _)) | i) and
+      n = bAccessorOrNamedFunction and
      (
        none()
        or
-        result = getImmediateChildOfFuncDecl(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfAccessorOrNamedFunction(e, index - b, partialPredicateCall)
      )
    )
  }
@@ -833,21 +833,6 @@ private module Impl {
    )
  }

-  private Element getImmediateChildOfConcreteFuncDecl(
-    ConcreteFuncDecl e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bFuncDecl, int n |
-      b = 0 and
-      bFuncDecl = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfFuncDecl(e, i, _)) | i) and
-      n = bFuncDecl and
-      (
-        none()
-        or
-        result = getImmediateChildOfFuncDecl(e, index - b, partialPredicateCall)
-      )
-    )
-  }
-
  private Element getImmediateChildOfConcreteVarDecl(
    ConcreteVarDecl e, int index, string partialPredicateCall
  ) {
@@ -879,6 +864,23 @@ private module Impl {
    )
  }

+  private Element getImmediateChildOfNamedFunction(
+    NamedFunction e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAccessorOrNamedFunction, int n |
+      b = 0 and
+      bAccessorOrNamedFunction =
+        b + 1 +
+          max(int i | i = -1 or exists(getImmediateChildOfAccessorOrNamedFunction(e, i, _)) | i) and
+      n = bAccessorOrNamedFunction and
+      (
+        none()
+        or
+        result = getImmediateChildOfAccessorOrNamedFunction(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
  private Element getImmediateChildOfNominalTypeDecl(
    NominalTypeDecl e, int index, string partialPredicateCall
  ) {
@@ -1040,25 +1042,6 @@ private module Impl {
    )
  }

-  private Element getImmediateChildOfAbstractClosureExpr(
-    AbstractClosureExpr e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bExpr, int bCallable, int n |
-      b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      bCallable =
-        bExpr + 1 + max(int i | i = -1 or exists(getImmediateChildOfCallable(e, i, _)) | i) and
-      n = bCallable and
-      (
-        none()
-        or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        result = getImmediateChildOfCallable(e, index - bExpr, partialPredicateCall)
-      )
-    )
-  }
-
  private Element getImmediateChildOfAnyTryExpr(AnyTryExpr e, int index, string partialPredicateCall) {
    exists(int b, int bExpr, int n, int nSubExpr |
      b = 0 and
@@ -1174,6 +1157,25 @@ private module Impl {
    )
  }

+  private Element getImmediateChildOfClosureExpr(
+    ClosureExpr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bExpr, int bCallable, int n |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      bCallable =
+        bExpr + 1 + max(int i | i = -1 or exists(getImmediateChildOfCallable(e, i, _)) | i) and
+      n = bCallable and
+      (
+        none()
+        or
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+        or
+        result = getImmediateChildOfCallable(e, index - bExpr, partialPredicateCall)
+      )
+    )
+  }
+
  private Element getImmediateChildOfCollectionExpr(
    CollectionExpr e, int index, string partialPredicateCall
  ) {
@@ -1482,8 +1484,8 @@ private module Impl {
    )
  }

-  private Element getImmediateChildOfLazyInitializerExpr(
-    LazyInitializerExpr e, int index, string partialPredicateCall
+  private Element getImmediateChildOfLazyInitializationExpr(
+    LazyInitializationExpr e, int index, string partialPredicateCall
  ) {
    exists(int b, int bExpr, int n, int nSubExpr |
      b = 0 and
@@ -1656,8 +1658,8 @@ private module Impl {
    )
  }

-  private Element getImmediateChildOfOtherConstructorDeclRefExpr(
-    OtherConstructorDeclRefExpr e, int index, string partialPredicateCall
+  private Element getImmediateChildOfOtherInitializerRefExpr(
+    OtherInitializerRefExpr e, int index, string partialPredicateCall
  ) {
    exists(int b, int bExpr, int n |
      b = 0 and
@@ -1705,8 +1707,8 @@ private module Impl {
    )
  }

-  private Element getImmediateChildOfRebindSelfInConstructorExpr(
-    RebindSelfInConstructorExpr e, int index, string partialPredicateCall
+  private Element getImmediateChildOfRebindSelfInInitializerExpr(
+    RebindSelfInInitializerExpr e, int index, string partialPredicateCall
  ) {
    exists(int b, int bExpr, int n, int nSubExpr |
      b = 0 and
@@ -2038,15 +2040,15 @@ private module Impl {
  private Element getImmediateChildOfAutoClosureExpr(
    AutoClosureExpr e, int index, string partialPredicateCall
  ) {
-    exists(int b, int bAbstractClosureExpr, int n |
+    exists(int b, int bClosureExpr, int n |
      b = 0 and
-      bAbstractClosureExpr =
-        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAbstractClosureExpr(e, i, _)) | i) and
-      n = bAbstractClosureExpr and
+      bClosureExpr =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfClosureExpr(e, i, _)) | i) and
+      n = bClosureExpr and
      (
        none()
        or
-        result = getImmediateChildOfAbstractClosureExpr(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfClosureExpr(e, index - b, partialPredicateCall)
      )
    )
  }
@@ -2174,22 +2176,6 @@ private module Impl {
    )
  }

-  private Element getImmediateChildOfClosureExpr(
-    ClosureExpr e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bAbstractClosureExpr, int n |
-      b = 0 and
-      bAbstractClosureExpr =
-        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAbstractClosureExpr(e, i, _)) | i) and
-      n = bAbstractClosureExpr and
-      (
-        none()
-        or
-        result = getImmediateChildOfAbstractClosureExpr(e, index - b, partialPredicateCall)
-      )
-    )
-  }
-
  private Element getImmediateChildOfCoerceExpr(CoerceExpr e, int index, string partialPredicateCall) {
    exists(int b, int bExplicitCastExpr, int n |
      b = 0 and
@@ -2426,6 +2412,22 @@ private module Impl {
    )
  }

+  private Element getImmediateChildOfExplicitClosureExpr(
+    ExplicitClosureExpr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bClosureExpr, int n |
+      b = 0 and
+      bClosureExpr =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfClosureExpr(e, i, _)) | i) and
+      n = bClosureExpr and
+      (
+        none()
+        or
+        result = getImmediateChildOfClosureExpr(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
  private Element getImmediateChildOfForceTryExpr(
    ForceTryExpr e, int index, string partialPredicateCall
  ) {
@@ -2984,22 +2986,6 @@ private module Impl {
    )
  }

-  private Element getImmediateChildOfConstructorRefCallExpr(
-    ConstructorRefCallExpr e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bSelfApplyExpr, int n |
-      b = 0 and
-      bSelfApplyExpr =
-        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfSelfApplyExpr(e, i, _)) | i) and
-      n = bSelfApplyExpr and
-      (
-        none()
-        or
-        result = getImmediateChildOfSelfApplyExpr(e, index - b, partialPredicateCall)
-      )
-    )
-  }
-
  private Element getImmediateChildOfDotSyntaxCallExpr(
    DotSyntaxCallExpr e, int index, string partialPredicateCall
  ) {
@@ -3064,6 +3050,22 @@ private module Impl {
    )
  }

+  private Element getImmediateChildOfInitializerRefCallExpr(
+    InitializerRefCallExpr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bSelfApplyExpr, int n |
+      b = 0 and
+      bSelfApplyExpr =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfSelfApplyExpr(e, i, _)) | i) and
+      n = bSelfApplyExpr and
+      (
+        none()
+        or
+        result = getImmediateChildOfSelfApplyExpr(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
  private Element getImmediateChildOfIsExpr(IsExpr e, int index, string partialPredicateCall) {
    exists(int b, int bCheckedCastExpr, int n |
      b = 0 and
@@ -4885,24 +4887,24 @@ private module Impl {
    or
    result = getImmediateChildOfPrefixOperatorDecl(e, index, partialAccessor)
    or
-    result = getImmediateChildOfConstructorDecl(e, index, partialAccessor)
+    result = getImmediateChildOfDeinitializer(e, index, partialAccessor)
    or
-    result = getImmediateChildOfDestructorDecl(e, index, partialAccessor)
+    result = getImmediateChildOfInitializer(e, index, partialAccessor)
    or
    result = getImmediateChildOfModuleDecl(e, index, partialAccessor)
    or
    result = getImmediateChildOfSubscriptDecl(e, index, partialAccessor)
    or
-    result = getImmediateChildOfAccessorDecl(e, index, partialAccessor)
+    result = getImmediateChildOfAccessor(e, index, partialAccessor)
    or
    result = getImmediateChildOfAssociatedTypeDecl(e, index, partialAccessor)
    or
-    result = getImmediateChildOfConcreteFuncDecl(e, index, partialAccessor)
-    or
    result = getImmediateChildOfConcreteVarDecl(e, index, partialAccessor)
    or
    result = getImmediateChildOfGenericTypeParamDecl(e, index, partialAccessor)
    or
+    result = getImmediateChildOfNamedFunction(e, index, partialAccessor)
+    or
    result = getImmediateChildOfOpaqueTypeDecl(e, index, partialAccessor)
    or
    result = getImmediateChildOfParamDecl(e, index, partialAccessor)
@@ -4953,7 +4955,7 @@ private module Impl {
    or
    result = getImmediateChildOfKeyPathExpr(e, index, partialAccessor)
    or
-    result = getImmediateChildOfLazyInitializerExpr(e, index, partialAccessor)
+    result = getImmediateChildOfLazyInitializationExpr(e, index, partialAccessor)
    or
    result = getImmediateChildOfMakeTemporarilyEscapableExpr(e, index, partialAccessor)
    or
@@ -4967,13 +4969,13 @@ private module Impl {
    or
    result = getImmediateChildOfOptionalEvaluationExpr(e, index, partialAccessor)
    or
-    result = getImmediateChildOfOtherConstructorDeclRefExpr(e, index, partialAccessor)
+    result = getImmediateChildOfOtherInitializerRefExpr(e, index, partialAccessor)
    or
    result = getImmediateChildOfOverloadedDeclRefExpr(e, index, partialAccessor)
    or
    result = getImmediateChildOfPropertyWrapperValuePlaceholderExpr(e, index, partialAccessor)
    or
-    result = getImmediateChildOfRebindSelfInConstructorExpr(e, index, partialAccessor)
+    result = getImmediateChildOfRebindSelfInInitializerExpr(e, index, partialAccessor)
    or
    result = getImmediateChildOfSequenceExpr(e, index, partialAccessor)
    or
@@ -5023,8 +5025,6 @@ private module Impl {
    or
    result = getImmediateChildOfClassMetatypeToObjectExpr(e, index, partialAccessor)
    or
-    result = getImmediateChildOfClosureExpr(e, index, partialAccessor)
-    or
    result = getImmediateChildOfCoerceExpr(e, index, partialAccessor)
    or
    result = getImmediateChildOfCollectionUpcastConversionExpr(e, index, partialAccessor)
@@ -5051,6 +5051,8 @@ private module Impl {
    or
    result = getImmediateChildOfExistentialMetatypeToObjectExpr(e, index, partialAccessor)
    or
+    result = getImmediateChildOfExplicitClosureExpr(e, index, partialAccessor)
+    or
    result = getImmediateChildOfForceTryExpr(e, index, partialAccessor)
    or
    result = getImmediateChildOfForeignObjectConversionExpr(e, index, partialAccessor)
@@ -5113,8 +5115,6 @@ private module Impl {
    or
    result = getImmediateChildOfConditionalCheckedCastExpr(e, index, partialAccessor)
    or
-    result = getImmediateChildOfConstructorRefCallExpr(e, index, partialAccessor)
-    or
    result = getImmediateChildOfDotSyntaxCallExpr(e, index, partialAccessor)
    or
    result = getImmediateChildOfDynamicMemberRefExpr(e, index, partialAccessor)
@@ -5123,6 +5123,8 @@ private module Impl {
    or
    result = getImmediateChildOfForcedCheckedCastExpr(e, index, partialAccessor)
    or
+    result = getImmediateChildOfInitializerRefCallExpr(e, index, partialAccessor)
+    or
    result = getImmediateChildOfIsExpr(e, index, partialAccessor)
    or
    result = getImmediateChildOfMagicIdentifierLiteralExpr(e, index, partialAccessor)
--- a/swift/ql/lib/codeql/swift/generated/Raw.qll
+++ b/swift/ql/lib/codeql/swift/generated/Raw.qll
@@ -500,22 +500,14 @@ module Raw {
    Type getInterfaceType() { value_decls(this, result) }
  }

-  /**
-   * INTERNAL: Do not use.
-   */
-  class AbstractFunctionDecl extends @abstract_function_decl, GenericContext, ValueDecl, Callable {
-  }
-
  /**
   * INTERNAL: Do not use.
   */
  class AbstractStorageDecl extends @abstract_storage_decl, ValueDecl {
    /**
-     * Gets the `index`th accessor declaration of this abstract storage declaration (0-based).
+     * Gets the `index`th accessor of this abstract storage declaration (0-based).
     */
-    AccessorDecl getAccessorDecl(int index) {
-      abstract_storage_decl_accessor_decls(this, index, result)
-    }
+    Accessor getAccessor(int index) { abstract_storage_decl_accessors(this, index, result) }
  }

  /**
@@ -535,6 +527,11 @@ module Raw {
    ParamDecl getParam(int index) { enum_element_decl_params(this, index, result) }
  }

+  /**
+   * INTERNAL: Do not use.
+   */
+  class Function extends @function, GenericContext, ValueDecl, Callable { }
+
  /**
   * INTERNAL: Do not use.
   */
@@ -584,27 +581,27 @@ module Raw {
  /**
   * INTERNAL: Do not use.
   */
-  class ConstructorDecl extends @constructor_decl, AbstractFunctionDecl {
-    override string toString() { result = "ConstructorDecl" }
-  }
+  class AccessorOrNamedFunction extends @accessor_or_named_function, Function { }

  /**
   * INTERNAL: Do not use.
   */
-  class DestructorDecl extends @destructor_decl, AbstractFunctionDecl {
-    override string toString() { result = "DestructorDecl" }
+  class Deinitializer extends @deinitializer, Function {
+    override string toString() { result = "Deinitializer" }
  }

-  /**
-   * INTERNAL: Do not use.
-   */
-  class FuncDecl extends @func_decl, AbstractFunctionDecl { }
-
  /**
   * INTERNAL: Do not use.
   */
  class GenericTypeDecl extends @generic_type_decl, GenericContext, TypeDecl { }

+  /**
+   * INTERNAL: Do not use.
+   */
+  class Initializer extends @initializer, Function {
+    override string toString() { result = "Initializer" }
+  }
+
  /**
   * INTERNAL: Do not use.
   */
@@ -770,48 +767,48 @@ module Raw {
  /**
   * INTERNAL: Do not use.
   */
-  class AccessorDecl extends @accessor_decl, FuncDecl {
-    override string toString() { result = "AccessorDecl" }
+  class Accessor extends @accessor, AccessorOrNamedFunction {
+    override string toString() { result = "Accessor" }

    /**
     * Holds if this accessor is a getter.
     */
-    predicate isGetter() { accessor_decl_is_getter(this) }
+    predicate isGetter() { accessor_is_getter(this) }

    /**
     * Holds if this accessor is a setter.
     */
-    predicate isSetter() { accessor_decl_is_setter(this) }
+    predicate isSetter() { accessor_is_setter(this) }

    /**
     * Holds if this accessor is a `willSet`, called before the property is set.
     */
-    predicate isWillSet() { accessor_decl_is_will_set(this) }
+    predicate isWillSet() { accessor_is_will_set(this) }

    /**
     * Holds if this accessor is a `didSet`, called after the property is set.
     */
-    predicate isDidSet() { accessor_decl_is_did_set(this) }
+    predicate isDidSet() { accessor_is_did_set(this) }

    /**
     * Holds if this accessor is a `_read` coroutine, yielding a borrowed value of the property.
     */
-    predicate isRead() { accessor_decl_is_read(this) }
+    predicate isRead() { accessor_is_read(this) }

    /**
     * Holds if this accessor is a `_modify` coroutine, yielding an inout value of the property.
     */
-    predicate isModify() { accessor_decl_is_modify(this) }
+    predicate isModify() { accessor_is_modify(this) }

    /**
     * Holds if this accessor is an `unsafeAddress` immutable addressor.
     */
-    predicate isUnsafeAddress() { accessor_decl_is_unsafe_address(this) }
+    predicate isUnsafeAddress() { accessor_is_unsafe_address(this) }

    /**
     * Holds if this accessor is an `unsafeMutableAddress` mutable addressor.
     */
-    predicate isUnsafeMutableAddress() { accessor_decl_is_unsafe_mutable_address(this) }
+    predicate isUnsafeMutableAddress() { accessor_is_unsafe_mutable_address(this) }
  }

  /**
@@ -821,13 +818,6 @@ module Raw {
    override string toString() { result = "AssociatedTypeDecl" }
  }

-  /**
-   * INTERNAL: Do not use.
-   */
-  class ConcreteFuncDecl extends @concrete_func_decl, FuncDecl {
-    override string toString() { result = "ConcreteFuncDecl" }
-  }
-
  /**
   * INTERNAL: Do not use.
   */
@@ -849,6 +839,13 @@ module Raw {
    override string toString() { result = "GenericTypeParamDecl" }
  }

+  /**
+   * INTERNAL: Do not use.
+   */
+  class NamedFunction extends @named_function, AccessorOrNamedFunction {
+    override string toString() { result = "NamedFunction" }
+  }
+
  /**
   * INTERNAL: Do not use.
   */
@@ -996,11 +993,6 @@ module Raw {
    Type getType() { expr_types(this, result) }
  }

-  /**
-   * INTERNAL: Do not use.
-   */
-  class AbstractClosureExpr extends @abstract_closure_expr, Expr, Callable { }
-
  /**
   * INTERNAL: Do not use.
   */
@@ -1098,9 +1090,14 @@ module Raw {
    /**
     * Gets the closure body of this capture list expression.
     */
-    ClosureExpr getClosureBody() { capture_list_exprs(this, result) }
+    ExplicitClosureExpr getClosureBody() { capture_list_exprs(this, result) }
  }

+  /**
+   * INTERNAL: Do not use.
+   */
+  class ClosureExpr extends @closure_expr, Expr, Callable { }
+
  /**
   * INTERNAL: Do not use.
   */
@@ -1348,13 +1345,13 @@ module Raw {
  /**
   * INTERNAL: Do not use.
   */
-  class LazyInitializerExpr extends @lazy_initializer_expr, Expr {
-    override string toString() { result = "LazyInitializerExpr" }
+  class LazyInitializationExpr extends @lazy_initialization_expr, Expr {
+    override string toString() { result = "LazyInitializationExpr" }

    /**
-     * Gets the sub expression of this lazy initializer expression.
+     * Gets the sub expression of this lazy initialization expression.
     */
-    Expr getSubExpr() { lazy_initializer_exprs(this, result) }
+    Expr getSubExpr() { lazy_initialization_exprs(this, result) }
  }

  /**
@@ -1413,7 +1410,7 @@ module Raw {
    /**
     * Gets the method of this obj c selector expression.
     */
-    AbstractFunctionDecl getMethod() { obj_c_selector_exprs(this, _, result) }
+    Function getMethod() { obj_c_selector_exprs(this, _, result) }
  }

  /**
@@ -1472,13 +1469,13 @@ module Raw {
  /**
   * INTERNAL: Do not use.
   */
-  class OtherConstructorDeclRefExpr extends @other_constructor_decl_ref_expr, Expr {
-    override string toString() { result = "OtherConstructorDeclRefExpr" }
+  class OtherInitializerRefExpr extends @other_initializer_ref_expr, Expr {
+    override string toString() { result = "OtherInitializerRefExpr" }

    /**
-     * Gets the constructor declaration of this other constructor declaration reference expression.
+     * Gets the initializer of this other initializer reference expression.
     */
-    ConstructorDecl getConstructorDecl() { other_constructor_decl_ref_exprs(this, result) }
+    Initializer getInitializer() { other_initializer_ref_exprs(this, result) }
  }

  /**
@@ -1519,18 +1516,18 @@ module Raw {
  /**
   * INTERNAL: Do not use.
   */
-  class RebindSelfInConstructorExpr extends @rebind_self_in_constructor_expr, Expr {
-    override string toString() { result = "RebindSelfInConstructorExpr" }
+  class RebindSelfInInitializerExpr extends @rebind_self_in_initializer_expr, Expr {
+    override string toString() { result = "RebindSelfInInitializerExpr" }

    /**
-     * Gets the sub expression of this rebind self in constructor expression.
+     * Gets the sub expression of this rebind self in initializer expression.
     */
-    Expr getSubExpr() { rebind_self_in_constructor_exprs(this, result, _) }
+    Expr getSubExpr() { rebind_self_in_initializer_exprs(this, result, _) }

    /**
-     * Gets the self of this rebind self in constructor expression.
+     * Gets the self of this rebind self in initializer expression.
     */
-    VarDecl getSelf() { rebind_self_in_constructor_exprs(this, _, result) }
+    VarDecl getSelf() { rebind_self_in_initializer_exprs(this, _, result) }
  }

  /**
@@ -1740,7 +1737,7 @@ module Raw {
  /**
   * INTERNAL: Do not use.
   */
-  class AutoClosureExpr extends @auto_closure_expr, AbstractClosureExpr {
+  class AutoClosureExpr extends @auto_closure_expr, ClosureExpr {
    override string toString() { result = "AutoClosureExpr" }
  }

@@ -1796,13 +1793,6 @@ module Raw {
    override string toString() { result = "ClassMetatypeToObjectExpr" }
  }

-  /**
-   * INTERNAL: Do not use.
-   */
-  class ClosureExpr extends @closure_expr, AbstractClosureExpr {
-    override string toString() { result = "ClosureExpr" }
-  }
-
  /**
   * INTERNAL: Do not use.
   */
@@ -1916,6 +1906,13 @@ module Raw {
    override string toString() { result = "ExistentialMetatypeToObjectExpr" }
  }

+  /**
+   * INTERNAL: Do not use.
+   */
+  class ExplicitClosureExpr extends @explicit_closure_expr, ClosureExpr {
+    override string toString() { result = "ExplicitClosureExpr" }
+  }
+
  /**
   * INTERNAL: Do not use.
   */
@@ -2258,13 +2255,6 @@ module Raw {
    override string toString() { result = "ConditionalCheckedCastExpr" }
  }

-  /**
-   * INTERNAL: Do not use.
-   */
-  class ConstructorRefCallExpr extends @constructor_ref_call_expr, SelfApplyExpr {
-    override string toString() { result = "ConstructorRefCallExpr" }
-  }
-
  /**
   * INTERNAL: Do not use.
   */
@@ -2293,6 +2283,13 @@ module Raw {
    override string toString() { result = "ForcedCheckedCastExpr" }
  }

+  /**
+   * INTERNAL: Do not use.
+   */
+  class InitializerRefCallExpr extends @initializer_ref_call_expr, SelfApplyExpr {
+    override string toString() { result = "InitializerRefCallExpr" }
+  }
+
  /**
   * INTERNAL: Do not use.
   */
--- a/swift/ql/lib/codeql/swift/generated/Synth.qll
+++ b/swift/ql/lib/codeql/swift/generated/Synth.qll
@@ -64,7 +64,7 @@ module Synth {
    /**
     * INTERNAL: Do not use.
     */
-    TAccessorDecl(Raw::AccessorDecl id) { constructAccessorDecl(id) } or
+    TAccessor(Raw::Accessor id) { constructAccessor(id) } or
    /**
     * INTERNAL: Do not use.
     */
@@ -77,10 +77,6 @@ module Synth {
     * INTERNAL: Do not use.
     */
    TClassDecl(Raw::ClassDecl id) { constructClassDecl(id) } or
-    /**
-     * INTERNAL: Do not use.
-     */
-    TConcreteFuncDecl(Raw::ConcreteFuncDecl id) { constructConcreteFuncDecl(id) } or
    /**
     * INTERNAL: Do not use.
     */
@@ -88,11 +84,7 @@ module Synth {
    /**
     * INTERNAL: Do not use.
     */
-    TConstructorDecl(Raw::ConstructorDecl id) { constructConstructorDecl(id) } or
-    /**
-     * INTERNAL: Do not use.
-     */
-    TDestructorDecl(Raw::DestructorDecl id) { constructDestructorDecl(id) } or
+    TDeinitializer(Raw::Deinitializer id) { constructDeinitializer(id) } or
    /**
     * INTERNAL: Do not use.
     */
@@ -125,6 +117,10 @@ module Synth {
     * INTERNAL: Do not use.
     */
    TInfixOperatorDecl(Raw::InfixOperatorDecl id) { constructInfixOperatorDecl(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TInitializer(Raw::Initializer id) { constructInitializer(id) } or
    /**
     * INTERNAL: Do not use.
     */
@@ -133,6 +129,10 @@ module Synth {
     * INTERNAL: Do not use.
     */
    TModuleDecl(Raw::ModuleDecl id) { constructModuleDecl(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TNamedFunction(Raw::NamedFunction id) { constructNamedFunction(id) } or
    /**
     * INTERNAL: Do not use.
     */
@@ -257,10 +257,6 @@ module Synth {
    TClassMetatypeToObjectExpr(Raw::ClassMetatypeToObjectExpr id) {
      constructClassMetatypeToObjectExpr(id)
    } or
-    /**
-     * INTERNAL: Do not use.
-     */
-    TClosureExpr(Raw::ClosureExpr id) { constructClosureExpr(id) } or
    /**
     * INTERNAL: Do not use.
     */
@@ -283,10 +279,6 @@ module Synth {
    TConditionalCheckedCastExpr(Raw::ConditionalCheckedCastExpr id) {
      constructConditionalCheckedCastExpr(id)
    } or
-    /**
-     * INTERNAL: Do not use.
-     */
-    TConstructorRefCallExpr(Raw::ConstructorRefCallExpr id) { constructConstructorRefCallExpr(id) } or
    /**
     * INTERNAL: Do not use.
     */
@@ -379,6 +371,10 @@ module Synth {
    TExistentialMetatypeToObjectExpr(Raw::ExistentialMetatypeToObjectExpr id) {
      constructExistentialMetatypeToObjectExpr(id)
    } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TExplicitClosureExpr(Raw::ExplicitClosureExpr id) { constructExplicitClosureExpr(id) } or
    /**
     * INTERNAL: Do not use.
     */
@@ -417,6 +413,10 @@ module Synth {
     * INTERNAL: Do not use.
     */
    TInOutToPointerExpr(Raw::InOutToPointerExpr id) { constructInOutToPointerExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TInitializerRefCallExpr(Raw::InitializerRefCallExpr id) { constructInitializerRefCallExpr(id) } or
    /**
     * INTERNAL: Do not use.
     */
@@ -450,7 +450,7 @@ module Synth {
    /**
     * INTERNAL: Do not use.
     */
-    TLazyInitializerExpr(Raw::LazyInitializerExpr id) { constructLazyInitializerExpr(id) } or
+    TLazyInitializationExpr(Raw::LazyInitializationExpr id) { constructLazyInitializationExpr(id) } or
    /**
     * INTERNAL: Do not use.
     */
@@ -530,8 +530,8 @@ module Synth {
    /**
     * INTERNAL: Do not use.
     */
-    TOtherConstructorDeclRefExpr(Raw::OtherConstructorDeclRefExpr id) {
-      constructOtherConstructorDeclRefExpr(id)
+    TOtherInitializerRefExpr(Raw::OtherInitializerRefExpr id) {
+      constructOtherInitializerRefExpr(id)
    } or
    /**
     * INTERNAL: Do not use.
@@ -568,8 +568,8 @@ module Synth {
    /**
     * INTERNAL: Do not use.
     */
-    TRebindSelfInConstructorExpr(Raw::RebindSelfInConstructorExpr id) {
-      constructRebindSelfInConstructorExpr(id)
+    TRebindSelfInInitializerExpr(Raw::RebindSelfInInitializerExpr id) {
+      constructRebindSelfInInitializerExpr(id)
    } or
    /**
     * INTERNAL: Do not use.
@@ -1027,7 +1027,7 @@ module Synth {
  /**
   * INTERNAL: Do not use.
   */
-  class TCallable = TAbstractClosureExpr or TAbstractFunctionDecl;
+  class TCallable = TClosureExpr or TFunction;

  /**
   * INTERNAL: Do not use.
@@ -1053,11 +1053,6 @@ module Synth {
   */
  class TLocation = TDbLocation or TUnknownLocation;

-  /**
-   * INTERNAL: Do not use.
-   */
-  class TAbstractFunctionDecl = TConstructorDecl or TDestructorDecl or TFuncDecl;
-
  /**
   * INTERNAL: Do not use.
   */
@@ -1068,6 +1063,11 @@ module Synth {
   */
  class TAbstractTypeParamDecl = TAssociatedTypeDecl or TGenericTypeParamDecl;

+  /**
+   * INTERNAL: Do not use.
+   */
+  class TAccessorOrNamedFunction = TAccessor or TNamedFunction;
+
  /**
   * INTERNAL: Do not use.
   */
@@ -1079,13 +1079,12 @@ module Synth {
  /**
   * INTERNAL: Do not use.
   */
-  class TFuncDecl = TAccessorDecl or TConcreteFuncDecl;
+  class TFunction = TAccessorOrNamedFunction or TDeinitializer or TInitializer;

  /**
   * INTERNAL: Do not use.
   */
-  class TGenericContext =
-    TAbstractFunctionDecl or TExtensionDecl or TGenericTypeDecl or TSubscriptDecl;
+  class TGenericContext = TExtensionDecl or TFunction or TGenericTypeDecl or TSubscriptDecl;

  /**
   * INTERNAL: Do not use.
@@ -1110,18 +1109,13 @@ module Synth {
  /**
   * INTERNAL: Do not use.
   */
-  class TValueDecl = TAbstractFunctionDecl or TAbstractStorageDecl or TEnumElementDecl or TTypeDecl;
+  class TValueDecl = TAbstractStorageDecl or TEnumElementDecl or TFunction or TTypeDecl;

  /**
   * INTERNAL: Do not use.
   */
  class TVarDecl = TConcreteVarDecl or TParamDecl;

-  /**
-   * INTERNAL: Do not use.
-   */
-  class TAbstractClosureExpr = TAutoClosureExpr or TClosureExpr;
-
  /**
   * INTERNAL: Do not use.
   */
@@ -1144,6 +1138,11 @@ module Synth {
   */
  class TCheckedCastExpr = TConditionalCheckedCastExpr or TForcedCheckedCastExpr or TIsExpr;

+  /**
+   * INTERNAL: Do not use.
+   */
+  class TClosureExpr = TAutoClosureExpr or TExplicitClosureExpr;
+
  /**
   * INTERNAL: Do not use.
   */
@@ -1163,16 +1162,16 @@ module Synth {
   * INTERNAL: Do not use.
   */
  class TExpr =
-    TAbstractClosureExpr or TAnyTryExpr or TAppliedPropertyWrapperExpr or TApplyExpr or
-        TAssignExpr or TBindOptionalExpr or TCaptureListExpr or TCollectionExpr or TDeclRefExpr or
+    TAnyTryExpr or TAppliedPropertyWrapperExpr or TApplyExpr or TAssignExpr or TBindOptionalExpr or
+        TCaptureListExpr or TClosureExpr or TCollectionExpr or TDeclRefExpr or
        TDefaultArgumentExpr or TDiscardAssignmentExpr or TDotSyntaxBaseIgnoredExpr or
        TDynamicTypeExpr or TEnumIsCaseExpr or TErrorExpr or TExplicitCastExpr or TForceValueExpr or
        TIdentityExpr or TIfExpr or TImplicitConversionExpr or TInOutExpr or
-        TKeyPathApplicationExpr or TKeyPathDotExpr or TKeyPathExpr or TLazyInitializerExpr or
+        TKeyPathApplicationExpr or TKeyPathDotExpr or TKeyPathExpr or TLazyInitializationExpr or
        TLiteralExpr or TLookupExpr or TMakeTemporarilyEscapableExpr or TObjCSelectorExpr or
        TOneWayExpr or TOpaqueValueExpr or TOpenExistentialExpr or TOptionalEvaluationExpr or
-        TOtherConstructorDeclRefExpr or TOverloadedDeclRefExpr or
-        TPropertyWrapperValuePlaceholderExpr or TRebindSelfInConstructorExpr or TSequenceExpr or
+        TOtherInitializerRefExpr or TOverloadedDeclRefExpr or
+        TPropertyWrapperValuePlaceholderExpr or TRebindSelfInInitializerExpr or TSequenceExpr or
        TSuperRefExpr or TTapExpr or TTupleElementExpr or TTupleExpr or TTypeExpr or
        TUnresolvedDeclRefExpr or TUnresolvedDotExpr or TUnresolvedMemberExpr or
        TUnresolvedPatternExpr or TUnresolvedSpecializeExpr or TVarargExpansionExpr;
@@ -1220,7 +1219,7 @@ module Synth {
  /**
   * INTERNAL: Do not use.
   */
-  class TSelfApplyExpr = TConstructorRefCallExpr or TDotSyntaxCallExpr;
+  class TSelfApplyExpr = TDotSyntaxCallExpr or TInitializerRefCallExpr;

  /**
   * INTERNAL: Do not use.
@@ -1419,10 +1418,10 @@ module Synth {

  /**
   * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TAccessorDecl`, if possible.
+   * Converts a raw element to a synthesized `TAccessor`, if possible.
   */
  cached
-  TAccessorDecl convertAccessorDeclFromRaw(Raw::Element e) { result = TAccessorDecl(e) }
+  TAccessor convertAccessorFromRaw(Raw::Element e) { result = TAccessor(e) }

  /**
   * INTERNAL: Do not use.
@@ -1447,13 +1446,6 @@ module Synth {
  cached
  TClassDecl convertClassDeclFromRaw(Raw::Element e) { result = TClassDecl(e) }

-  /**
-   * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TConcreteFuncDecl`, if possible.
-   */
-  cached
-  TConcreteFuncDecl convertConcreteFuncDeclFromRaw(Raw::Element e) { result = TConcreteFuncDecl(e) }
-
  /**
   * INTERNAL: Do not use.
   * Converts a raw element to a synthesized `TConcreteVarDecl`, if possible.
@@ -1463,17 +1455,10 @@ module Synth {

  /**
   * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TConstructorDecl`, if possible.
+   * Converts a raw element to a synthesized `TDeinitializer`, if possible.
   */
  cached
-  TConstructorDecl convertConstructorDeclFromRaw(Raw::Element e) { result = TConstructorDecl(e) }
-
-  /**
-   * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TDestructorDecl`, if possible.
-   */
-  cached
-  TDestructorDecl convertDestructorDeclFromRaw(Raw::Element e) { result = TDestructorDecl(e) }
+  TDeinitializer convertDeinitializerFromRaw(Raw::Element e) { result = TDeinitializer(e) }

  /**
   * INTERNAL: Do not use.
@@ -1535,6 +1520,13 @@ module Synth {
    result = TInfixOperatorDecl(e)
  }

+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TInitializer`, if possible.
+   */
+  cached
+  TInitializer convertInitializerFromRaw(Raw::Element e) { result = TInitializer(e) }
+
  /**
   * INTERNAL: Do not use.
   * Converts a raw element to a synthesized `TMissingMemberDecl`, if possible.
@@ -1551,6 +1543,13 @@ module Synth {
  cached
  TModuleDecl convertModuleDeclFromRaw(Raw::Element e) { result = TModuleDecl(e) }

+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TNamedFunction`, if possible.
+   */
+  cached
+  TNamedFunction convertNamedFunctionFromRaw(Raw::Element e) { result = TNamedFunction(e) }
+
  /**
   * INTERNAL: Do not use.
   * Converts a raw element to a synthesized `TOpaqueTypeDecl`, if possible.
@@ -1787,13 +1786,6 @@ module Synth {
    result = TClassMetatypeToObjectExpr(e)
  }

-  /**
-   * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TClosureExpr`, if possible.
-   */
-  cached
-  TClosureExpr convertClosureExprFromRaw(Raw::Element e) { result = TClosureExpr(e) }
-
  /**
   * INTERNAL: Do not use.
   * Converts a raw element to a synthesized `TCoerceExpr`, if possible.
@@ -1828,15 +1820,6 @@ module Synth {
    result = TConditionalCheckedCastExpr(e)
  }

-  /**
-   * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TConstructorRefCallExpr`, if possible.
-   */
-  cached
-  TConstructorRefCallExpr convertConstructorRefCallExprFromRaw(Raw::Element e) {
-    result = TConstructorRefCallExpr(e)
-  }
-
  /**
   * INTERNAL: Do not use.
   * Converts a raw element to a synthesized `TCovariantFunctionConversionExpr`, if possible.
@@ -2005,6 +1988,15 @@ module Synth {
    result = TExistentialMetatypeToObjectExpr(e)
  }

+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TExplicitClosureExpr`, if possible.
+   */
+  cached
+  TExplicitClosureExpr convertExplicitClosureExprFromRaw(Raw::Element e) {
+    result = TExplicitClosureExpr(e)
+  }
+
  /**
   * INTERNAL: Do not use.
   * Converts a raw element to a synthesized `TFloatLiteralExpr`, if possible.
@@ -2076,6 +2068,15 @@ module Synth {
    result = TInOutToPointerExpr(e)
  }

+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TInitializerRefCallExpr`, if possible.
+   */
+  cached
+  TInitializerRefCallExpr convertInitializerRefCallExprFromRaw(Raw::Element e) {
+    result = TInitializerRefCallExpr(e)
+  }
+
  /**
   * INTERNAL: Do not use.
   * Converts a raw element to a synthesized `TInjectIntoOptionalExpr`, if possible.
@@ -2135,11 +2136,11 @@ module Synth {

  /**
   * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TLazyInitializerExpr`, if possible.
+   * Converts a raw element to a synthesized `TLazyInitializationExpr`, if possible.
   */
  cached
-  TLazyInitializerExpr convertLazyInitializerExprFromRaw(Raw::Element e) {
-    result = TLazyInitializerExpr(e)
+  TLazyInitializationExpr convertLazyInitializationExprFromRaw(Raw::Element e) {
+    result = TLazyInitializationExpr(e)
  }

  /**
@@ -2283,11 +2284,11 @@ module Synth {

  /**
   * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TOtherConstructorDeclRefExpr`, if possible.
+   * Converts a raw element to a synthesized `TOtherInitializerRefExpr`, if possible.
   */
  cached
-  TOtherConstructorDeclRefExpr convertOtherConstructorDeclRefExprFromRaw(Raw::Element e) {
-    result = TOtherConstructorDeclRefExpr(e)
+  TOtherInitializerRefExpr convertOtherInitializerRefExprFromRaw(Raw::Element e) {
+    result = TOtherInitializerRefExpr(e)
  }

  /**
@@ -2351,11 +2352,11 @@ module Synth {

  /**
   * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRebindSelfInConstructorExpr`, if possible.
+   * Converts a raw element to a synthesized `TRebindSelfInInitializerExpr`, if possible.
   */
  cached
-  TRebindSelfInConstructorExpr convertRebindSelfInConstructorExprFromRaw(Raw::Element e) {
-    result = TRebindSelfInConstructorExpr(e)
+  TRebindSelfInInitializerExpr convertRebindSelfInInitializerExprFromRaw(Raw::Element e) {
+    result = TRebindSelfInInitializerExpr(e)
  }

  /**
@@ -3205,9 +3206,9 @@ module Synth {
   */
  cached
  TCallable convertCallableFromRaw(Raw::Element e) {
-    result = convertAbstractClosureExprFromRaw(e)
+    result = convertClosureExprFromRaw(e)
    or
-    result = convertAbstractFunctionDeclFromRaw(e)
+    result = convertFunctionFromRaw(e)
  }

  /**
@@ -3299,19 +3300,6 @@ module Synth {
    result = convertUnknownLocationFromRaw(e)
  }

-  /**
-   * INTERNAL: Do not use.
-   * Converts a raw DB element to a synthesized `TAbstractFunctionDecl`, if possible.
-   */
-  cached
-  TAbstractFunctionDecl convertAbstractFunctionDeclFromRaw(Raw::Element e) {
-    result = convertConstructorDeclFromRaw(e)
-    or
-    result = convertDestructorDeclFromRaw(e)
-    or
-    result = convertFuncDeclFromRaw(e)
-  }
-
  /**
   * INTERNAL: Do not use.
   * Converts a raw DB element to a synthesized `TAbstractStorageDecl`, if possible.
@@ -3334,6 +3322,17 @@ module Synth {
    result = convertGenericTypeParamDeclFromRaw(e)
  }

+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TAccessorOrNamedFunction`, if possible.
+   */
+  cached
+  TAccessorOrNamedFunction convertAccessorOrNamedFunctionFromRaw(Raw::Element e) {
+    result = convertAccessorFromRaw(e)
+    or
+    result = convertNamedFunctionFromRaw(e)
+  }
+
  /**
   * INTERNAL: Do not use.
   * Converts a raw DB element to a synthesized `TDecl`, if possible.
@@ -3367,13 +3366,15 @@ module Synth {

  /**
   * INTERNAL: Do not use.
-   * Converts a raw DB element to a synthesized `TFuncDecl`, if possible.
+   * Converts a raw DB element to a synthesized `TFunction`, if possible.
   */
  cached
-  TFuncDecl convertFuncDeclFromRaw(Raw::Element e) {
-    result = convertAccessorDeclFromRaw(e)
+  TFunction convertFunctionFromRaw(Raw::Element e) {
+    result = convertAccessorOrNamedFunctionFromRaw(e)
    or
-    result = convertConcreteFuncDeclFromRaw(e)
+    result = convertDeinitializerFromRaw(e)
+    or
+    result = convertInitializerFromRaw(e)
  }

  /**
@@ -3382,10 +3383,10 @@ module Synth {
   */
  cached
  TGenericContext convertGenericContextFromRaw(Raw::Element e) {
-    result = convertAbstractFunctionDeclFromRaw(e)
-    or
    result = convertExtensionDeclFromRaw(e)
    or
+    result = convertFunctionFromRaw(e)
+    or
    result = convertGenericTypeDeclFromRaw(e)
    or
    result = convertSubscriptDeclFromRaw(e)
@@ -3451,12 +3452,12 @@ module Synth {
   */
  cached
  TValueDecl convertValueDeclFromRaw(Raw::Element e) {
-    result = convertAbstractFunctionDeclFromRaw(e)
-    or
    result = convertAbstractStorageDeclFromRaw(e)
    or
    result = convertEnumElementDeclFromRaw(e)
    or
+    result = convertFunctionFromRaw(e)
+    or
    result = convertTypeDeclFromRaw(e)
  }

@@ -3471,17 +3472,6 @@ module Synth {
    result = convertParamDeclFromRaw(e)
  }

-  /**
-   * INTERNAL: Do not use.
-   * Converts a raw DB element to a synthesized `TAbstractClosureExpr`, if possible.
-   */
-  cached
-  TAbstractClosureExpr convertAbstractClosureExprFromRaw(Raw::Element e) {
-    result = convertAutoClosureExprFromRaw(e)
-    or
-    result = convertClosureExprFromRaw(e)
-  }
-
  /**
   * INTERNAL: Do not use.
   * Converts a raw DB element to a synthesized `TAnyTryExpr`, if possible.
@@ -3540,6 +3530,17 @@ module Synth {
    result = convertIsExprFromRaw(e)
  }

+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TClosureExpr`, if possible.
+   */
+  cached
+  TClosureExpr convertClosureExprFromRaw(Raw::Element e) {
+    result = convertAutoClosureExprFromRaw(e)
+    or
+    result = convertExplicitClosureExprFromRaw(e)
+  }
+
  /**
   * INTERNAL: Do not use.
   * Converts a raw DB element to a synthesized `TCollectionExpr`, if possible.
@@ -3579,8 +3580,6 @@ module Synth {
   */
  cached
  TExpr convertExprFromRaw(Raw::Element e) {
-    result = convertAbstractClosureExprFromRaw(e)
-    or
    result = convertAnyTryExprFromRaw(e)
    or
    result = convertAppliedPropertyWrapperExprFromRaw(e)
@@ -3593,6 +3592,8 @@ module Synth {
    or
    result = convertCaptureListExprFromRaw(e)
    or
+    result = convertClosureExprFromRaw(e)
+    or
    result = convertCollectionExprFromRaw(e)
    or
    result = convertDeclRefExprFromRaw(e)
@@ -3627,7 +3628,7 @@ module Synth {
    or
    result = convertKeyPathExprFromRaw(e)
    or
-    result = convertLazyInitializerExprFromRaw(e)
+    result = convertLazyInitializationExprFromRaw(e)
    or
    result = convertLiteralExprFromRaw(e)
    or
@@ -3645,13 +3646,13 @@ module Synth {
    or
    result = convertOptionalEvaluationExprFromRaw(e)
    or
-    result = convertOtherConstructorDeclRefExprFromRaw(e)
+    result = convertOtherInitializerRefExprFromRaw(e)
    or
    result = convertOverloadedDeclRefExprFromRaw(e)
    or
    result = convertPropertyWrapperValuePlaceholderExprFromRaw(e)
    or
-    result = convertRebindSelfInConstructorExprFromRaw(e)
+    result = convertRebindSelfInInitializerExprFromRaw(e)
    or
    result = convertSequenceExprFromRaw(e)
    or
@@ -3813,9 +3814,9 @@ module Synth {
   */
  cached
  TSelfApplyExpr convertSelfApplyExprFromRaw(Raw::Element e) {
-    result = convertConstructorRefCallExprFromRaw(e)
-    or
    result = convertDotSyntaxCallExprFromRaw(e)
+    or
+    result = convertInitializerRefCallExprFromRaw(e)
  }

  /**
@@ -4224,10 +4225,10 @@ module Synth {

  /**
   * INTERNAL: Do not use.
-   * Converts a synthesized `TAccessorDecl` to a raw DB element, if possible.
+   * Converts a synthesized `TAccessor` to a raw DB element, if possible.
   */
  cached
-  Raw::Element convertAccessorDeclToRaw(TAccessorDecl e) { e = TAccessorDecl(result) }
+  Raw::Element convertAccessorToRaw(TAccessor e) { e = TAccessor(result) }

  /**
   * INTERNAL: Do not use.
@@ -4252,13 +4253,6 @@ module Synth {
  cached
  Raw::Element convertClassDeclToRaw(TClassDecl e) { e = TClassDecl(result) }

-  /**
-   * INTERNAL: Do not use.
-   * Converts a synthesized `TConcreteFuncDecl` to a raw DB element, if possible.
-   */
-  cached
-  Raw::Element convertConcreteFuncDeclToRaw(TConcreteFuncDecl e) { e = TConcreteFuncDecl(result) }
-
  /**
   * INTERNAL: Do not use.
   * Converts a synthesized `TConcreteVarDecl` to a raw DB element, if possible.
@@ -4268,17 +4262,10 @@ module Synth {

  /**
   * INTERNAL: Do not use.
-   * Converts a synthesized `TConstructorDecl` to a raw DB element, if possible.
+   * Converts a synthesized `TDeinitializer` to a raw DB element, if possible.
   */
  cached
-  Raw::Element convertConstructorDeclToRaw(TConstructorDecl e) { e = TConstructorDecl(result) }
-
-  /**
-   * INTERNAL: Do not use.
-   * Converts a synthesized `TDestructorDecl` to a raw DB element, if possible.
-   */
-  cached
-  Raw::Element convertDestructorDeclToRaw(TDestructorDecl e) { e = TDestructorDecl(result) }
+  Raw::Element convertDeinitializerToRaw(TDeinitializer e) { e = TDeinitializer(result) }

  /**
   * INTERNAL: Do not use.
@@ -4340,6 +4327,13 @@ module Synth {
    e = TInfixOperatorDecl(result)
  }

+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TInitializer` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertInitializerToRaw(TInitializer e) { e = TInitializer(result) }
+
  /**
   * INTERNAL: Do not use.
   * Converts a synthesized `TMissingMemberDecl` to a raw DB element, if possible.
@@ -4356,6 +4350,13 @@ module Synth {
  cached
  Raw::Element convertModuleDeclToRaw(TModuleDecl e) { e = TModuleDecl(result) }

+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TNamedFunction` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertNamedFunctionToRaw(TNamedFunction e) { e = TNamedFunction(result) }
+
  /**
   * INTERNAL: Do not use.
   * Converts a synthesized `TOpaqueTypeDecl` to a raw DB element, if possible.
@@ -4592,13 +4593,6 @@ module Synth {
    e = TClassMetatypeToObjectExpr(result)
  }

-  /**
-   * INTERNAL: Do not use.
-   * Converts a synthesized `TClosureExpr` to a raw DB element, if possible.
-   */
-  cached
-  Raw::Element convertClosureExprToRaw(TClosureExpr e) { e = TClosureExpr(result) }
-
  /**
   * INTERNAL: Do not use.
   * Converts a synthesized `TCoerceExpr` to a raw DB element, if possible.
@@ -4633,15 +4627,6 @@ module Synth {
    e = TConditionalCheckedCastExpr(result)
  }

-  /**
-   * INTERNAL: Do not use.
-   * Converts a synthesized `TConstructorRefCallExpr` to a raw DB element, if possible.
-   */
-  cached
-  Raw::Element convertConstructorRefCallExprToRaw(TConstructorRefCallExpr e) {
-    e = TConstructorRefCallExpr(result)
-  }
-
  /**
   * INTERNAL: Do not use.
   * Converts a synthesized `TCovariantFunctionConversionExpr` to a raw DB element, if possible.
@@ -4810,6 +4795,15 @@ module Synth {
    e = TExistentialMetatypeToObjectExpr(result)
  }

+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TExplicitClosureExpr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertExplicitClosureExprToRaw(TExplicitClosureExpr e) {
+    e = TExplicitClosureExpr(result)
+  }
+
  /**
   * INTERNAL: Do not use.
   * Converts a synthesized `TFloatLiteralExpr` to a raw DB element, if possible.
@@ -4881,6 +4875,15 @@ module Synth {
    e = TInOutToPointerExpr(result)
  }

+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TInitializerRefCallExpr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertInitializerRefCallExprToRaw(TInitializerRefCallExpr e) {
+    e = TInitializerRefCallExpr(result)
+  }
+
  /**
   * INTERNAL: Do not use.
   * Converts a synthesized `TInjectIntoOptionalExpr` to a raw DB element, if possible.
@@ -4940,11 +4943,11 @@ module Synth {

  /**
   * INTERNAL: Do not use.
-   * Converts a synthesized `TLazyInitializerExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TLazyInitializationExpr` to a raw DB element, if possible.
   */
  cached
-  Raw::Element convertLazyInitializerExprToRaw(TLazyInitializerExpr e) {
-    e = TLazyInitializerExpr(result)
+  Raw::Element convertLazyInitializationExprToRaw(TLazyInitializationExpr e) {
+    e = TLazyInitializationExpr(result)
  }

  /**
@@ -5086,11 +5089,11 @@ module Synth {

  /**
   * INTERNAL: Do not use.
-   * Converts a synthesized `TOtherConstructorDeclRefExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TOtherInitializerRefExpr` to a raw DB element, if possible.
   */
  cached
-  Raw::Element convertOtherConstructorDeclRefExprToRaw(TOtherConstructorDeclRefExpr e) {
-    e = TOtherConstructorDeclRefExpr(result)
+  Raw::Element convertOtherInitializerRefExprToRaw(TOtherInitializerRefExpr e) {
+    e = TOtherInitializerRefExpr(result)
  }

  /**
@@ -5154,11 +5157,11 @@ module Synth {

  /**
   * INTERNAL: Do not use.
-   * Converts a synthesized `TRebindSelfInConstructorExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TRebindSelfInInitializerExpr` to a raw DB element, if possible.
   */
  cached
-  Raw::Element convertRebindSelfInConstructorExprToRaw(TRebindSelfInConstructorExpr e) {
-    e = TRebindSelfInConstructorExpr(result)
+  Raw::Element convertRebindSelfInInitializerExprToRaw(TRebindSelfInInitializerExpr e) {
+    e = TRebindSelfInInitializerExpr(result)
  }

  /**
@@ -6008,9 +6011,9 @@ module Synth {
   */
  cached
  Raw::Element convertCallableToRaw(TCallable e) {
-    result = convertAbstractClosureExprToRaw(e)
+    result = convertClosureExprToRaw(e)
    or
-    result = convertAbstractFunctionDeclToRaw(e)
+    result = convertFunctionToRaw(e)
  }

  /**
@@ -6102,19 +6105,6 @@ module Synth {
    result = convertUnknownLocationToRaw(e)
  }

-  /**
-   * INTERNAL: Do not use.
-   * Converts a synthesized `TAbstractFunctionDecl` to a raw DB element, if possible.
-   */
-  cached
-  Raw::Element convertAbstractFunctionDeclToRaw(TAbstractFunctionDecl e) {
-    result = convertConstructorDeclToRaw(e)
-    or
-    result = convertDestructorDeclToRaw(e)
-    or
-    result = convertFuncDeclToRaw(e)
-  }
-
  /**
   * INTERNAL: Do not use.
   * Converts a synthesized `TAbstractStorageDecl` to a raw DB element, if possible.
@@ -6137,6 +6127,17 @@ module Synth {
    result = convertGenericTypeParamDeclToRaw(e)
  }

+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TAccessorOrNamedFunction` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertAccessorOrNamedFunctionToRaw(TAccessorOrNamedFunction e) {
+    result = convertAccessorToRaw(e)
+    or
+    result = convertNamedFunctionToRaw(e)
+  }
+
  /**
   * INTERNAL: Do not use.
   * Converts a synthesized `TDecl` to a raw DB element, if possible.
@@ -6170,13 +6171,15 @@ module Synth {

  /**
   * INTERNAL: Do not use.
-   * Converts a synthesized `TFuncDecl` to a raw DB element, if possible.
+   * Converts a synthesized `TFunction` to a raw DB element, if possible.
   */
  cached
-  Raw::Element convertFuncDeclToRaw(TFuncDecl e) {
-    result = convertAccessorDeclToRaw(e)
+  Raw::Element convertFunctionToRaw(TFunction e) {
+    result = convertAccessorOrNamedFunctionToRaw(e)
    or
-    result = convertConcreteFuncDeclToRaw(e)
+    result = convertDeinitializerToRaw(e)
+    or
+    result = convertInitializerToRaw(e)
  }

  /**
@@ -6185,10 +6188,10 @@ module Synth {
   */
  cached
  Raw::Element convertGenericContextToRaw(TGenericContext e) {
-    result = convertAbstractFunctionDeclToRaw(e)
-    or
    result = convertExtensionDeclToRaw(e)
    or
+    result = convertFunctionToRaw(e)
+    or
    result = convertGenericTypeDeclToRaw(e)
    or
    result = convertSubscriptDeclToRaw(e)
@@ -6254,12 +6257,12 @@ module Synth {
   */
  cached
  Raw::Element convertValueDeclToRaw(TValueDecl e) {
-    result = convertAbstractFunctionDeclToRaw(e)
-    or
    result = convertAbstractStorageDeclToRaw(e)
    or
    result = convertEnumElementDeclToRaw(e)
    or
+    result = convertFunctionToRaw(e)
+    or
    result = convertTypeDeclToRaw(e)
  }

@@ -6274,17 +6277,6 @@ module Synth {
    result = convertParamDeclToRaw(e)
  }

-  /**
-   * INTERNAL: Do not use.
-   * Converts a synthesized `TAbstractClosureExpr` to a raw DB element, if possible.
-   */
-  cached
-  Raw::Element convertAbstractClosureExprToRaw(TAbstractClosureExpr e) {
-    result = convertAutoClosureExprToRaw(e)
-    or
-    result = convertClosureExprToRaw(e)
-  }
-
  /**
   * INTERNAL: Do not use.
   * Converts a synthesized `TAnyTryExpr` to a raw DB element, if possible.
@@ -6343,6 +6335,17 @@ module Synth {
    result = convertIsExprToRaw(e)
  }

+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TClosureExpr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertClosureExprToRaw(TClosureExpr e) {
+    result = convertAutoClosureExprToRaw(e)
+    or
+    result = convertExplicitClosureExprToRaw(e)
+  }
+
  /**
   * INTERNAL: Do not use.
   * Converts a synthesized `TCollectionExpr` to a raw DB element, if possible.
@@ -6382,8 +6385,6 @@ module Synth {
   */
  cached
  Raw::Element convertExprToRaw(TExpr e) {
-    result = convertAbstractClosureExprToRaw(e)
-    or
    result = convertAnyTryExprToRaw(e)
    or
    result = convertAppliedPropertyWrapperExprToRaw(e)
@@ -6396,6 +6397,8 @@ module Synth {
    or
    result = convertCaptureListExprToRaw(e)
    or
+    result = convertClosureExprToRaw(e)
+    or
    result = convertCollectionExprToRaw(e)
    or
    result = convertDeclRefExprToRaw(e)
@@ -6430,7 +6433,7 @@ module Synth {
    or
    result = convertKeyPathExprToRaw(e)
    or
-    result = convertLazyInitializerExprToRaw(e)
+    result = convertLazyInitializationExprToRaw(e)
    or
    result = convertLiteralExprToRaw(e)
    or
@@ -6448,13 +6451,13 @@ module Synth {
    or
    result = convertOptionalEvaluationExprToRaw(e)
    or
-    result = convertOtherConstructorDeclRefExprToRaw(e)
+    result = convertOtherInitializerRefExprToRaw(e)
    or
    result = convertOverloadedDeclRefExprToRaw(e)
    or
    result = convertPropertyWrapperValuePlaceholderExprToRaw(e)
    or
-    result = convertRebindSelfInConstructorExprToRaw(e)
+    result = convertRebindSelfInInitializerExprToRaw(e)
    or
    result = convertSequenceExprToRaw(e)
    or
@@ -6616,9 +6619,9 @@ module Synth {
   */
  cached
  Raw::Element convertSelfApplyExprToRaw(TSelfApplyExpr e) {
-    result = convertConstructorRefCallExprToRaw(e)
-    or
    result = convertDotSyntaxCallExprToRaw(e)
+    or
+    result = convertInitializerRefCallExprToRaw(e)
  }

  /**
--- a/swift/ql/lib/codeql/swift/generated/SynthConstructors.qll
+++ b/swift/ql/lib/codeql/swift/generated/SynthConstructors.qll
@@ -8,14 +8,12 @@ import codeql.swift.elements.KeyPathComponentConstructor
 import codeql.swift.elements.OtherAvailabilitySpecConstructor
 import codeql.swift.elements.PlatformVersionAvailabilitySpecConstructor
 import codeql.swift.elements.UnspecifiedElementConstructor
-import codeql.swift.elements.decl.AccessorDeclConstructor
+import codeql.swift.elements.decl.AccessorConstructor
 import codeql.swift.elements.decl.AssociatedTypeDeclConstructor
 import codeql.swift.elements.decl.CapturedDeclConstructor
 import codeql.swift.elements.decl.ClassDeclConstructor
-import codeql.swift.elements.decl.ConcreteFuncDeclConstructor
 import codeql.swift.elements.decl.ConcreteVarDeclConstructor
-import codeql.swift.elements.decl.ConstructorDeclConstructor
-import codeql.swift.elements.decl.DestructorDeclConstructor
+import codeql.swift.elements.decl.DeinitializerConstructor
 import codeql.swift.elements.decl.EnumCaseDeclConstructor
 import codeql.swift.elements.decl.EnumDeclConstructor
 import codeql.swift.elements.decl.EnumElementDeclConstructor
@@ -24,8 +22,10 @@ import codeql.swift.elements.decl.GenericTypeParamDeclConstructor
 import codeql.swift.elements.decl.IfConfigDeclConstructor
 import codeql.swift.elements.decl.ImportDeclConstructor
 import codeql.swift.elements.decl.InfixOperatorDeclConstructor
+import codeql.swift.elements.decl.InitializerConstructor
 import codeql.swift.elements.decl.MissingMemberDeclConstructor
 import codeql.swift.elements.decl.ModuleDeclConstructor
+import codeql.swift.elements.decl.NamedFunctionConstructor
 import codeql.swift.elements.decl.OpaqueTypeDeclConstructor
 import codeql.swift.elements.decl.ParamDeclConstructor
 import codeql.swift.elements.decl.PatternBindingDeclConstructor
@@ -56,12 +56,10 @@ import codeql.swift.elements.expr.BridgeToObjCExprConstructor
 import codeql.swift.elements.expr.CallExprConstructor
 import codeql.swift.elements.expr.CaptureListExprConstructor
 import codeql.swift.elements.expr.ClassMetatypeToObjectExprConstructor
-import codeql.swift.elements.expr.ClosureExprConstructor
 import codeql.swift.elements.expr.CoerceExprConstructor
 import codeql.swift.elements.expr.CollectionUpcastConversionExprConstructor
 import codeql.swift.elements.expr.ConditionalBridgeFromObjCExprConstructor
 import codeql.swift.elements.expr.ConditionalCheckedCastExprConstructor
-import codeql.swift.elements.expr.ConstructorRefCallExprConstructor
 import codeql.swift.elements.expr.CovariantFunctionConversionExprConstructor
 import codeql.swift.elements.expr.CovariantReturnConversionExprConstructor
 import codeql.swift.elements.expr.DeclRefExprConstructor
@@ -82,6 +80,7 @@ import codeql.swift.elements.expr.EnumIsCaseExprConstructor
 import codeql.swift.elements.expr.ErasureExprConstructor
 import codeql.swift.elements.expr.ErrorExprConstructor
 import codeql.swift.elements.expr.ExistentialMetatypeToObjectExprConstructor
+import codeql.swift.elements.expr.ExplicitClosureExprConstructor
 import codeql.swift.elements.expr.FloatLiteralExprConstructor
 import codeql.swift.elements.expr.ForceTryExprConstructor
 import codeql.swift.elements.expr.ForceValueExprConstructor
@@ -91,6 +90,7 @@ import codeql.swift.elements.expr.FunctionConversionExprConstructor
 import codeql.swift.elements.expr.IfExprConstructor
 import codeql.swift.elements.expr.InOutExprConstructor
 import codeql.swift.elements.expr.InOutToPointerExprConstructor
+import codeql.swift.elements.expr.InitializerRefCallExprConstructor
 import codeql.swift.elements.expr.InjectIntoOptionalExprConstructor
 import codeql.swift.elements.expr.IntegerLiteralExprConstructor
 import codeql.swift.elements.expr.InterpolatedStringLiteralExprConstructor
@@ -98,7 +98,7 @@ import codeql.swift.elements.expr.IsExprConstructor
 import codeql.swift.elements.expr.KeyPathApplicationExprConstructor
 import codeql.swift.elements.expr.KeyPathDotExprConstructor
 import codeql.swift.elements.expr.KeyPathExprConstructor
-import codeql.swift.elements.expr.LazyInitializerExprConstructor
+import codeql.swift.elements.expr.LazyInitializationExprConstructor
 import codeql.swift.elements.expr.LinearFunctionExprConstructor
 import codeql.swift.elements.expr.LinearFunctionExtractOriginalExprConstructor
 import codeql.swift.elements.expr.LinearToDifferentiableFunctionExprConstructor
@@ -116,7 +116,7 @@ import codeql.swift.elements.expr.OpaqueValueExprConstructor
 import codeql.swift.elements.expr.OpenExistentialExprConstructor
 import codeql.swift.elements.expr.OptionalEvaluationExprConstructor
 import codeql.swift.elements.expr.OptionalTryExprConstructor
-import codeql.swift.elements.expr.OtherConstructorDeclRefExprConstructor
+import codeql.swift.elements.expr.OtherInitializerRefExprConstructor
 import codeql.swift.elements.expr.OverloadedDeclRefExprConstructor
 import codeql.swift.elements.expr.ParenExprConstructor
 import codeql.swift.elements.expr.PointerToPointerExprConstructor
@@ -124,7 +124,7 @@ import codeql.swift.elements.expr.PostfixUnaryExprConstructor
 import codeql.swift.elements.expr.PrefixUnaryExprConstructor
 import codeql.swift.elements.expr.PropertyWrapperValuePlaceholderExprConstructor
 import codeql.swift.elements.expr.ProtocolMetatypeToObjectExprConstructor
-import codeql.swift.elements.expr.RebindSelfInConstructorExprConstructor
+import codeql.swift.elements.expr.RebindSelfInInitializerExprConstructor
 import codeql.swift.elements.expr.RegexLiteralExprConstructor
 import codeql.swift.elements.expr.SequenceExprConstructor
 import codeql.swift.elements.expr.StringLiteralExprConstructor
--- a/swift/ql/lib/codeql/swift/generated/decl/AbstractStorageDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/AbstractStorageDecl.qll
@@ -1,39 +1,37 @@
 // generated by codegen/codegen.py
 private import codeql.swift.generated.Synth
 private import codeql.swift.generated.Raw
-import codeql.swift.elements.decl.AccessorDecl
+import codeql.swift.elements.decl.Accessor
 import codeql.swift.elements.decl.ValueDecl

 module Generated {
  class AbstractStorageDecl extends Synth::TAbstractStorageDecl, ValueDecl {
    /**
-     * Gets the `index`th accessor declaration of this abstract storage declaration (0-based).
+     * Gets the `index`th accessor of this abstract storage declaration (0-based).
     *
     * This includes nodes from the "hidden" AST. It can be overridden in subclasses to change the
     * behavior of both the `Immediate` and non-`Immediate` versions.
     */
-    AccessorDecl getImmediateAccessorDecl(int index) {
+    Accessor getImmediateAccessor(int index) {
      result =
-        Synth::convertAccessorDeclFromRaw(Synth::convertAbstractStorageDeclToRaw(this)
+        Synth::convertAccessorFromRaw(Synth::convertAbstractStorageDeclToRaw(this)
              .(Raw::AbstractStorageDecl)
-              .getAccessorDecl(index))
+              .getAccessor(index))
    }

    /**
-     * Gets the `index`th accessor declaration of this abstract storage declaration (0-based).
+     * Gets the `index`th accessor of this abstract storage declaration (0-based).
     */
-    final AccessorDecl getAccessorDecl(int index) {
-      result = getImmediateAccessorDecl(index).resolve()
-    }
+    final Accessor getAccessor(int index) { result = getImmediateAccessor(index).resolve() }

    /**
-     * Gets any of the accessor declarations of this abstract storage declaration.
+     * Gets any of the accessors of this abstract storage declaration.
     */
-    final AccessorDecl getAnAccessorDecl() { result = getAccessorDecl(_) }
+    final Accessor getAnAccessor() { result = getAccessor(_) }

    /**
-     * Gets the number of accessor declarations of this abstract storage declaration.
+     * Gets the number of accessors of this abstract storage declaration.
     */
-    final int getNumberOfAccessorDecls() { result = count(int i | exists(getAccessorDecl(i))) }
+    final int getNumberOfAccessors() { result = count(int i | exists(getAccessor(i))) }
  }
 }
--- a/swift/ql/lib/codeql/swift/generated/decl/AccessorDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/AccessorDecl.qll
@@ -1,54 +1,54 @@
 // generated by codegen/codegen.py
 private import codeql.swift.generated.Synth
 private import codeql.swift.generated.Raw
-import codeql.swift.elements.decl.FuncDecl
+import codeql.swift.elements.decl.AccessorOrNamedFunction

 module Generated {
-  class AccessorDecl extends Synth::TAccessorDecl, FuncDecl {
-    override string getAPrimaryQlClass() { result = "AccessorDecl" }
+  class Accessor extends Synth::TAccessor, AccessorOrNamedFunction {
+    override string getAPrimaryQlClass() { result = "Accessor" }

    /**
     * Holds if this accessor is a getter.
     */
-    predicate isGetter() { Synth::convertAccessorDeclToRaw(this).(Raw::AccessorDecl).isGetter() }
+    predicate isGetter() { Synth::convertAccessorToRaw(this).(Raw::Accessor).isGetter() }

    /**
     * Holds if this accessor is a setter.
     */
-    predicate isSetter() { Synth::convertAccessorDeclToRaw(this).(Raw::AccessorDecl).isSetter() }
+    predicate isSetter() { Synth::convertAccessorToRaw(this).(Raw::Accessor).isSetter() }

    /**
     * Holds if this accessor is a `willSet`, called before the property is set.
     */
-    predicate isWillSet() { Synth::convertAccessorDeclToRaw(this).(Raw::AccessorDecl).isWillSet() }
+    predicate isWillSet() { Synth::convertAccessorToRaw(this).(Raw::Accessor).isWillSet() }

    /**
     * Holds if this accessor is a `didSet`, called after the property is set.
     */
-    predicate isDidSet() { Synth::convertAccessorDeclToRaw(this).(Raw::AccessorDecl).isDidSet() }
+    predicate isDidSet() { Synth::convertAccessorToRaw(this).(Raw::Accessor).isDidSet() }

    /**
     * Holds if this accessor is a `_read` coroutine, yielding a borrowed value of the property.
     */
-    predicate isRead() { Synth::convertAccessorDeclToRaw(this).(Raw::AccessorDecl).isRead() }
+    predicate isRead() { Synth::convertAccessorToRaw(this).(Raw::Accessor).isRead() }

    /**
     * Holds if this accessor is a `_modify` coroutine, yielding an inout value of the property.
     */
-    predicate isModify() { Synth::convertAccessorDeclToRaw(this).(Raw::AccessorDecl).isModify() }
+    predicate isModify() { Synth::convertAccessorToRaw(this).(Raw::Accessor).isModify() }

    /**
     * Holds if this accessor is an `unsafeAddress` immutable addressor.
     */
    predicate isUnsafeAddress() {
-      Synth::convertAccessorDeclToRaw(this).(Raw::AccessorDecl).isUnsafeAddress()
+      Synth::convertAccessorToRaw(this).(Raw::Accessor).isUnsafeAddress()
    }

    /**
     * Holds if this accessor is an `unsafeMutableAddress` mutable addressor.
     */
    predicate isUnsafeMutableAddress() {
-      Synth::convertAccessorDeclToRaw(this).(Raw::AccessorDecl).isUnsafeMutableAddress()
+      Synth::convertAccessorToRaw(this).(Raw::Accessor).isUnsafeMutableAddress()
    }
  }
 }
--- a/swift/ql/lib/codeql/swift/generated/decl/AccessorOrNamedFunction.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/AccessorOrNamedFunction.qll
@@ -0,0 +1,11 @@
+// generated by codegen/codegen.py
+private import codeql.swift.generated.Synth
+private import codeql.swift.generated.Raw
+import codeql.swift.elements.decl.Function
+
+module Generated {
+  /**
+   * INTERNAL: Do not use.
+   */
+  class AccessorOrNamedFunction extends Synth::TAccessorOrNamedFunction, Function { }
+}
--- a/swift/ql/lib/codeql/swift/generated/decl/ConcreteFuncDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/ConcreteFuncDecl.qll
@@ -1,10 +0,0 @@
-// generated by codegen/codegen.py
-private import codeql.swift.generated.Synth
-private import codeql.swift.generated.Raw
-import codeql.swift.elements.decl.FuncDecl
-
-module Generated {
-  class ConcreteFuncDecl extends Synth::TConcreteFuncDecl, FuncDecl {
-    override string getAPrimaryQlClass() { result = "ConcreteFuncDecl" }
-  }
-}
--- a/swift/ql/lib/codeql/swift/generated/decl/ConstructorDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/ConstructorDecl.qll
@@ -1,10 +0,0 @@
-// generated by codegen/codegen.py
-private import codeql.swift.generated.Synth
-private import codeql.swift.generated.Raw
-import codeql.swift.elements.decl.AbstractFunctionDecl
-
-module Generated {
-  class ConstructorDecl extends Synth::TConstructorDecl, AbstractFunctionDecl {
-    override string getAPrimaryQlClass() { result = "ConstructorDecl" }
-  }
-}
--- a/swift/ql/lib/codeql/swift/generated/decl/Deinitializer.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/Deinitializer.qll
@@ -0,0 +1,10 @@
+// generated by codegen/codegen.py
+private import codeql.swift.generated.Synth
+private import codeql.swift.generated.Raw
+import codeql.swift.elements.decl.Function
+
+module Generated {
+  class Deinitializer extends Synth::TDeinitializer, Function {
+    override string getAPrimaryQlClass() { result = "Deinitializer" }
+  }
+}
--- a/swift/ql/lib/codeql/swift/generated/decl/DestructorDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/DestructorDecl.qll
@@ -1,10 +0,0 @@
-// generated by codegen/codegen.py
-private import codeql.swift.generated.Synth
-private import codeql.swift.generated.Raw
-import codeql.swift.elements.decl.AbstractFunctionDecl
-
-module Generated {
-  class DestructorDecl extends Synth::TDestructorDecl, AbstractFunctionDecl {
-    override string getAPrimaryQlClass() { result = "DestructorDecl" }
-  }
-}
--- a/swift/ql/lib/codeql/swift/generated/decl/FuncDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/FuncDecl.qll
@@ -1,8 +0,0 @@
-// generated by codegen/codegen.py
-private import codeql.swift.generated.Synth
-private import codeql.swift.generated.Raw
-import codeql.swift.elements.decl.AbstractFunctionDecl
-
-module Generated {
-  class FuncDecl extends Synth::TFuncDecl, AbstractFunctionDecl { }
-}
--- a/swift/ql/lib/codeql/swift/generated/decl/AbstractFunctionDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/AbstractFunctionDecl.qll
@@ -6,7 +6,5 @@ import codeql.swift.elements.decl.GenericContext
 import codeql.swift.elements.decl.ValueDecl

 module Generated {
-  class AbstractFunctionDecl extends Synth::TAbstractFunctionDecl, GenericContext, ValueDecl,
-    Callable
-  { }
+  class Function extends Synth::TFunction, GenericContext, ValueDecl, Callable { }
 }
--- a/swift/ql/lib/codeql/swift/generated/decl/Initializer.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/Initializer.qll
@@ -0,0 +1,10 @@
+// generated by codegen/codegen.py
+private import codeql.swift.generated.Synth
+private import codeql.swift.generated.Raw
+import codeql.swift.elements.decl.Function
+
+module Generated {
+  class Initializer extends Synth::TInitializer, Function {
+    override string getAPrimaryQlClass() { result = "Initializer" }
+  }
+}
--- a/swift/ql/lib/codeql/swift/generated/decl/NamedFunction.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/NamedFunction.qll
@@ -0,0 +1,10 @@
+// generated by codegen/codegen.py
+private import codeql.swift.generated.Synth
+private import codeql.swift.generated.Raw
+import codeql.swift.elements.decl.AccessorOrNamedFunction
+
+module Generated {
+  class NamedFunction extends Synth::TNamedFunction, AccessorOrNamedFunction {
+    override string getAPrimaryQlClass() { result = "NamedFunction" }
+  }
+}
--- a/swift/ql/lib/codeql/swift/generated/expr/AbstractClosureExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/AbstractClosureExpr.qll
@@ -1,9 +0,0 @@
-// generated by codegen/codegen.py
-private import codeql.swift.generated.Synth
-private import codeql.swift.generated.Raw
-import codeql.swift.elements.Callable
-import codeql.swift.elements.expr.Expr
-
-module Generated {
-  class AbstractClosureExpr extends Synth::TAbstractClosureExpr, Expr, Callable { }
-}
--- a/swift/ql/lib/codeql/swift/generated/expr/AutoClosureExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/AutoClosureExpr.qll
@@ -1,10 +1,10 @@
 // generated by codegen/codegen.py
 private import codeql.swift.generated.Synth
 private import codeql.swift.generated.Raw
-import codeql.swift.elements.expr.AbstractClosureExpr
+import codeql.swift.elements.expr.ClosureExpr

 module Generated {
-  class AutoClosureExpr extends Synth::TAutoClosureExpr, AbstractClosureExpr {
+  class AutoClosureExpr extends Synth::TAutoClosureExpr, ClosureExpr {
    override string getAPrimaryQlClass() { result = "AutoClosureExpr" }
  }
 }
--- a/swift/ql/lib/codeql/swift/generated/expr/CaptureListExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/CaptureListExpr.qll
@@ -1,7 +1,7 @@
 // generated by codegen/codegen.py
 private import codeql.swift.generated.Synth
 private import codeql.swift.generated.Raw
-import codeql.swift.elements.expr.ClosureExpr
+import codeql.swift.elements.expr.ExplicitClosureExpr
 import codeql.swift.elements.expr.Expr
 import codeql.swift.elements.decl.PatternBindingDecl

@@ -45,9 +45,9 @@ module Generated {
     * This includes nodes from the "hidden" AST. It can be overridden in subclasses to change the
     * behavior of both the `Immediate` and non-`Immediate` versions.
     */
-    ClosureExpr getImmediateClosureBody() {
+    ExplicitClosureExpr getImmediateClosureBody() {
      result =
-        Synth::convertClosureExprFromRaw(Synth::convertCaptureListExprToRaw(this)
+        Synth::convertExplicitClosureExprFromRaw(Synth::convertCaptureListExprToRaw(this)
              .(Raw::CaptureListExpr)
              .getClosureBody())
    }
@@ -55,6 +55,6 @@ module Generated {
    /**
     * Gets the closure body of this capture list expression.
     */
-    final ClosureExpr getClosureBody() { result = getImmediateClosureBody().resolve() }
+    final ExplicitClosureExpr getClosureBody() { result = getImmediateClosureBody().resolve() }
  }
 }
--- a/swift/ql/lib/codeql/swift/generated/expr/ClosureExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/ClosureExpr.qll
@@ -1,10 +1,9 @@
 // generated by codegen/codegen.py
 private import codeql.swift.generated.Synth
 private import codeql.swift.generated.Raw
-import codeql.swift.elements.expr.AbstractClosureExpr
+import codeql.swift.elements.Callable
+import codeql.swift.elements.expr.Expr

 module Generated {
-  class ClosureExpr extends Synth::TClosureExpr, AbstractClosureExpr {
-    override string getAPrimaryQlClass() { result = "ClosureExpr" }
-  }
+  class ClosureExpr extends Synth::TClosureExpr, Expr, Callable { }
 }
--- a/swift/ql/lib/codeql/swift/generated/expr/DotSyntaxCallExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/DotSyntaxCallExpr.qll
@@ -4,6 +4,9 @@ private import codeql.swift.generated.Raw
 import codeql.swift.elements.expr.SelfApplyExpr

 module Generated {
+  /**
+   * INTERNAL: Do not use.
+   */
  class DotSyntaxCallExpr extends Synth::TDotSyntaxCallExpr, SelfApplyExpr {
    override string getAPrimaryQlClass() { result = "DotSyntaxCallExpr" }
  }
--- a/swift/ql/lib/codeql/swift/generated/expr/ExplicitClosureExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/ExplicitClosureExpr.qll
@@ -0,0 +1,10 @@
+// generated by codegen/codegen.py
+private import codeql.swift.generated.Synth
+private import codeql.swift.generated.Raw
+import codeql.swift.elements.expr.ClosureExpr
+
+module Generated {
+  class ExplicitClosureExpr extends Synth::TExplicitClosureExpr, ClosureExpr {
+    override string getAPrimaryQlClass() { result = "ExplicitClosureExpr" }
+  }
+}
--- a/swift/ql/lib/codeql/swift/generated/expr/InitializerRefCallExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/InitializerRefCallExpr.qll
@@ -4,7 +4,10 @@ private import codeql.swift.generated.Raw
 import codeql.swift.elements.expr.SelfApplyExpr

 module Generated {
-  class ConstructorRefCallExpr extends Synth::TConstructorRefCallExpr, SelfApplyExpr {
-    override string getAPrimaryQlClass() { result = "ConstructorRefCallExpr" }
+  /**
+   * INTERNAL: Do not use.
+   */
+  class InitializerRefCallExpr extends Synth::TInitializerRefCallExpr, SelfApplyExpr {
+    override string getAPrimaryQlClass() { result = "InitializerRefCallExpr" }
  }
 }
--- a/swift/ql/lib/codeql/swift/generated/expr/LazyInitializationExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/LazyInitializationExpr.qll
@@ -4,24 +4,24 @@ private import codeql.swift.generated.Raw
 import codeql.swift.elements.expr.Expr

 module Generated {
-  class LazyInitializerExpr extends Synth::TLazyInitializerExpr, Expr {
-    override string getAPrimaryQlClass() { result = "LazyInitializerExpr" }
+  class LazyInitializationExpr extends Synth::TLazyInitializationExpr, Expr {
+    override string getAPrimaryQlClass() { result = "LazyInitializationExpr" }

    /**
-     * Gets the sub expression of this lazy initializer expression.
+     * Gets the sub expression of this lazy initialization expression.
     *
     * This includes nodes from the "hidden" AST. It can be overridden in subclasses to change the
     * behavior of both the `Immediate` and non-`Immediate` versions.
     */
    Expr getImmediateSubExpr() {
      result =
-        Synth::convertExprFromRaw(Synth::convertLazyInitializerExprToRaw(this)
-              .(Raw::LazyInitializerExpr)
+        Synth::convertExprFromRaw(Synth::convertLazyInitializationExprToRaw(this)
+              .(Raw::LazyInitializationExpr)
              .getSubExpr())
    }

    /**
-     * Gets the sub expression of this lazy initializer expression.
+     * Gets the sub expression of this lazy initialization expression.
     */
    final Expr getSubExpr() { result = getImmediateSubExpr().resolve() }
  }
--- a/swift/ql/lib/codeql/swift/generated/expr/ObjCSelectorExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/ObjCSelectorExpr.qll
@@ -1,8 +1,8 @@
 // generated by codegen/codegen.py
 private import codeql.swift.generated.Synth
 private import codeql.swift.generated.Raw
-import codeql.swift.elements.decl.AbstractFunctionDecl
 import codeql.swift.elements.expr.Expr
+import codeql.swift.elements.decl.Function

 module Generated {
  class ObjCSelectorExpr extends Synth::TObjCSelectorExpr, Expr {
@@ -32,9 +32,9 @@ module Generated {
     * This includes nodes from the "hidden" AST. It can be overridden in subclasses to change the
     * behavior of both the `Immediate` and non-`Immediate` versions.
     */
-    AbstractFunctionDecl getImmediateMethod() {
+    Function getImmediateMethod() {
      result =
-        Synth::convertAbstractFunctionDeclFromRaw(Synth::convertObjCSelectorExprToRaw(this)
+        Synth::convertFunctionFromRaw(Synth::convertObjCSelectorExprToRaw(this)
              .(Raw::ObjCSelectorExpr)
              .getMethod())
    }
@@ -42,6 +42,6 @@ module Generated {
    /**
     * Gets the method of this obj c selector expression.
     */
-    final AbstractFunctionDecl getMethod() { result = getImmediateMethod().resolve() }
+    final Function getMethod() { result = getImmediateMethod().resolve() }
  }
 }
--- a/Show More
+++ b/Show More