Merge branch 'alexdenisov/5.8-rebase' into alexdenisov/swift-5.8-resource-dir

Merge branch 'main' into alexdenisov/5.8-rebase
Swift: remove outdated db migration
2026-05-16 04:09:27 +02:00 · 2023-06-01 09:23:05 +02:00 · 2023-06-01 09:22:23 +02:00 · 2023-06-01 09:00:55 +02:00 · 2023-05-05 08:14:38 +02:00 · 2023-05-05 08:12:45 +02:00
41 changed files with 438 additions and 148 deletions
--- a/.github/workflows/swift.yml
+++ b/.github/workflows/swift.yml
@@ -15,6 +15,7 @@ on:
      - "!**/*.qhelp"
    branches:
      - main
+      - redsun82/swift-5.8
      - rc/*
      - codeql-cli-*
  push:
--- a/swift/actions/build-and-test/action.yml
+++ b/swift/actions/build-and-test/action.yml
@@ -44,15 +44,15 @@ runs:
        mkdir -p bazel-cache/{repository,disk}
        echo build --repository_cache=bazel-cache/repository --disk_cache=bazel-cache/disk > local.bazelrc
        echo test --test_output=errors >> local.bazelrc
-    - name: Print unextracted entities
-      shell: bash
-      run: |
-        bazel run //swift/extractor/print_unextracted
    - uses: ./swift/actions/share-extractor-pack
    - name: Build Swift extractor
      shell: bash
      run: |
        bazel run //swift:create-extractor-pack
+    - name: Print Swift extractor version
+      shell: bash
+      run: |
+        swift/extractor-pack/tools/*/extractor --version
    - name: Run codegen tests
      if : ${{ github.event_name == 'pull_request' }}
      shell: bash
--- a/swift/actions/run-integration-tests/action.yml
+++ b/swift/actions/run-integration-tests/action.yml
@@ -13,7 +13,7 @@ runs:
    - uses: actions/setup-python@v4
      with:
        python-version-file: 'swift/.python-version'
-    - uses: swift-actions/setup-swift@da0e3e04b5e3e15dbc3861bd835ad9f0afe56296
+    - uses: swift-actions/setup-swift@65540b95f51493d65f5e59e97dcef9629ddf11bf
      with:
        swift-version: "${{steps.get_swift_version.outputs.version}}"
    - uses: ./.github/actions/fetch-codeql
--- a/swift/extractor/infra/SwiftTagTraits.h
+++ b/swift/extractor/infra/SwiftTagTraits.h
@@ -95,6 +95,7 @@ MAP(swift::Expr, ExprTag)
  MAP(swift::IdentityExpr, IdentityExprTag)
    MAP(swift::ParenExpr, ParenExprTag)
    MAP(swift::DotSelfExpr, DotSelfExprTag)
+    MAP(swift::MoveExpr, void)  // TODO (introduced in 5.8)
    MAP(swift::AwaitExpr, AwaitExprTag)
    MAP(swift::UnresolvedMemberChainResultExpr, UnresolvedMemberChainResultExprTag)
  MAP(swift::AnyTryExpr, AnyTryExprTag)
@@ -113,6 +114,8 @@ MAP(swift::Expr, ExprTag)
    MAP(swift::AutoClosureExpr, AutoClosureExprTag)
  MAP(swift::InOutExpr, InOutExprTag)
  MAP(swift::VarargExpansionExpr, VarargExpansionExprTag)
+  MAP(swift::PackExpansionExpr, void)  // TODO (introduced in 5.8)
+  MAP(swift::PackElementExpr, void)  // TODO (introduced in 5.8)
  MAP(swift::DynamicTypeExpr, DynamicTypeExprTag)
  MAP(swift::RebindSelfInConstructorExpr, RebindSelfInInitializerExprTag)
  MAP(swift::OpaqueValueExpr, OpaqueValueExprTag)
@@ -164,7 +167,6 @@ MAP(swift::Expr, ExprTag)
    MAP(swift::DifferentiableFunctionExtractOriginalExpr, DifferentiableFunctionExtractOriginalExprTag)
    MAP(swift::LinearFunctionExtractOriginalExpr, LinearFunctionExtractOriginalExprTag)
    MAP(swift::LinearToDifferentiableFunctionExpr, LinearToDifferentiableFunctionExprTag)
-    MAP(swift::ReifyPackExpr, void)  // experimental variadic generics
    MAP(swift::ABISafeConversionExpr, AbiSafeConversionExprTag)  // different acronym convention
  MAP(swift::ExplicitCastExpr, ExplicitCastExprTag)
    MAP(swift::CheckedCastExpr, CheckedCastExprTag)
@@ -173,7 +175,7 @@ MAP(swift::Expr, ExprTag)
      MAP(swift::IsExpr, IsExprTag)
    MAP(swift::CoerceExpr, CoerceExprTag)
  MAP(swift::ArrowExpr, void)  // not present after the Sema phase
-  MAP(swift::IfExpr, IfExprTag)
+  MAP(swift::TernaryExpr, IfExprTag)
  MAP(swift::EnumIsCaseExpr, EnumIsCaseExprTag)
  MAP(swift::AssignExpr, AssignExprTag)
  MAP(swift::CodeCompletionExpr, void) // only generated for code editing
@@ -185,8 +187,8 @@ MAP(swift::Expr, ExprTag)
  MAP(swift::KeyPathDotExpr, KeyPathDotExprTag)
  MAP(swift::OneWayExpr, OneWayExprTag)
  MAP(swift::TapExpr, TapExprTag)
-  MAP(swift::PackExpr, void)  // experimental variadic generics
-
+  MAP(swift::TypeJoinExpr, void)  // TODO (introduced in 5.8)
+  MAP(swift::MacroExpansionExpr, void)  // TODO (introduced in 5.8)
 MAP(swift::Decl, DeclTag)
  MAP(swift::ValueDecl, ValueDeclTag)
    MAP(swift::TypeDecl, TypeDeclTag)
@@ -196,11 +198,11 @@ MAP(swift::Decl, DeclTag)
          MAP(swift::StructDecl, StructDeclTag)
          MAP(swift::ClassDecl, ClassDeclTag)
          MAP(swift::ProtocolDecl, ProtocolDeclTag)
+          MAP(swift::BuiltinTupleDecl, void)  // TODO (introduced in 5.8)
        MAP(swift::OpaqueTypeDecl, OpaqueTypeDeclTag)
        MAP(swift::TypeAliasDecl, TypeAliasDeclTag)
-      MAP(swift::AbstractTypeParamDecl, AbstractTypeParamDeclTag)
-        MAP(swift::GenericTypeParamDecl, GenericTypeParamDeclTag)
-        MAP(swift::AssociatedTypeDecl, AssociatedTypeDeclTag)
+      MAP(swift::GenericTypeParamDecl, GenericTypeParamDeclTag)
+      MAP(swift::AssociatedTypeDecl, AssociatedTypeDeclTag)
      MAP(swift::ModuleDecl, ModuleDeclTag)
    MAP(swift::AbstractStorageDecl, AbstractStorageDeclTag)
      MAP(swift::VarDecl, VarDeclTag)
@@ -213,6 +215,7 @@ MAP(swift::Decl, DeclTag)
      MAP(swift::FuncDecl, AccessorOrNamedFunctionTag)
        MAP_CONCRETE(swift::FuncDecl, NamedFunctionTag)
        MAP(swift::AccessorDecl, AccessorTag)
+    MAP(swift::MacroDecl, void)  // TODO (introduced in 5.8)
    MAP(swift::EnumElementDecl, EnumElementDeclTag)
  MAP(swift::ExtensionDecl, ExtensionDeclTag)
  MAP(swift::TopLevelCodeDecl, TopLevelCodeDeclTag)
@@ -227,6 +230,7 @@ MAP(swift::Decl, DeclTag)
    MAP(swift::InfixOperatorDecl, InfixOperatorDeclTag)
    MAP(swift::PrefixOperatorDecl, PrefixOperatorDeclTag)
    MAP(swift::PostfixOperatorDecl, PostfixOperatorDeclTag)
+  MAP(swift::MacroExpansionDecl, void)  // TODO (introduced in 5.8)

 MAP(swift::Pattern, PatternTag)
  MAP(swift::ParenPattern, ParenPatternTag)
@@ -274,6 +278,7 @@ MAP(swift::TypeBase, TypeTag)
        MAP(swift::StructType, StructTypeTag)
        MAP(swift::ClassType, ClassTypeTag)
        MAP(swift::ProtocolType, ProtocolTypeTag)
+        MAP(swift::BuiltinTupleType, void)  // TODO (introduced in 5.8)
      MAP(swift::BoundGenericType, BoundGenericTypeTag)
        MAP(swift::BoundGenericClassType, BoundGenericClassTypeTag)
        MAP(swift::BoundGenericEnumType, BoundGenericEnumTypeTag)
@@ -288,8 +293,10 @@ MAP(swift::TypeBase, TypeTag)
    MAP(swift::ArchetypeType, ArchetypeTypeTag)
      MAP(swift::PrimaryArchetypeType, PrimaryArchetypeTypeTag)
      MAP(swift::OpaqueTypeArchetypeType, OpaqueTypeArchetypeTypeTag)
-      MAP(swift::OpenedArchetypeType, OpenedArchetypeTypeTag)
-      MAP(swift::SequenceArchetypeType, void)  // experimental variadic generics
+      MAP(swift::LocalArchetypeType, OpenedArchetypeTypeTag)  // TODO (introduced in 5.8)
+        MAP(swift::OpenedArchetypeType, OpenedArchetypeTypeTag)
+        MAP(swift::ElementArchetypeType, void)  // TODO (introduced in 5.8)
+      MAP(swift::PackArchetypeType, void)  // TODO (introduced in 5.8)
    MAP(swift::GenericTypeParamType, GenericTypeParamTypeTag)
  MAP(swift::DependentMemberType, DependentMemberTypeTag)
  MAP(swift::AnyFunctionType, AnyFunctionTypeTag)
@@ -298,6 +305,7 @@ MAP(swift::TypeBase, TypeTag)
  MAP(swift::SILFunctionType, void)  // SIL types cannot really appear in the frontend run)
  MAP(swift::SILBlockStorageType, void)  // SIL types cannot really appear in the frontend run)
  MAP(swift::SILBoxType, void)  // SIL types cannot really appear in the frontend run)
+  MAP(swift::SILMoveOnlyWrappedType, void)  // SIL types cannot really appear in the frontend run)
  MAP(swift::SILTokenType, void)  // SIL types cannot really appear in the frontend run)
  MAP(swift::ProtocolCompositionType, ProtocolCompositionTypeTag)
  MAP(swift::ParameterizedProtocolType, ParameterizedProtocolTypeTag)
--- a/swift/extractor/main.cpp
+++ b/swift/extractor/main.cpp
@@ -208,6 +208,17 @@ int main(int argc, char** argv, char** envp) {
    // TODO: print usage
    return 1;
  }
+  // EXTRACTOR="$CODEQL_EXTRACTOR_SWIFT_ROOT/tools/$CODEQL_PLATFORM/extractor"
+  auto extractorRoot = getenv_or("CODEQL_EXTRACTOR_SWIFT_ROOT", ".");
+  auto platformDir = getenv_or("CODEQL_PLATFORM", ".");
+  auto resourceDir = extractorRoot + "/qltest/" + platformDir + "/sdk/resource-dir";
+  for (int i = 0; i < argc; i++) {
+    auto arg = std::string(argv[i]);
+    if (arg == "-resource-dir" || arg == "--resource-dir") {
+      argv[i + 1] = strdup(resourceDir.c_str());
+      break;
+    }
+  }

  // Required by Swift/LLVM
  PROGRAM_START(argc, argv);
--- a/swift/extractor/translators/ExprTranslator.cpp
+++ b/swift/extractor/translators/ExprTranslator.cpp
@@ -403,7 +403,7 @@ codeql::ForceValueExpr ExprTranslator::translateForceValueExpr(const swift::Forc
  return entry;
 }

-codeql::IfExpr ExprTranslator::translateIfExpr(const swift::IfExpr& expr) {
+codeql::IfExpr ExprTranslator::translateTernaryExpr(const swift::TernaryExpr& expr) {
  auto entry = createExprEntry(expr);
  entry.condition = dispatcher.fetchLabel(expr.getCondExpr());
  entry.then_expr = dispatcher.fetchLabel(expr.getThenExpr());
--- a/swift/extractor/translators/ExprTranslator.h
+++ b/swift/extractor/translators/ExprTranslator.h
@@ -90,7 +90,7 @@ class ExprTranslator : public AstTranslatorBase<ExprTranslator> {
  codeql::LazyInitializationExpr translateLazyInitializerExpr(
      const swift::LazyInitializerExpr& expr);
  codeql::ForceValueExpr translateForceValueExpr(const swift::ForceValueExpr& expr);
-  codeql::IfExpr translateIfExpr(const swift::IfExpr& expr);
+  codeql::IfExpr translateTernaryExpr(const swift::TernaryExpr& expr);
  codeql::KeyPathDotExpr translateKeyPathDotExpr(const swift::KeyPathDotExpr& expr);
  codeql::KeyPathApplicationExpr translateKeyPathApplicationExpr(
      const swift::KeyPathApplicationExpr& expr);
--- a/swift/ql/.generated.list
+++ b/swift/ql/.generated.list
@@ -381,9 +381,9 @@ lib/codeql/swift/generated/Locatable.qll be20967d48a34cdba126fe298606e0adc116978
 lib/codeql/swift/generated/Location.qll c5793987e77812059a28254dadee29bfe9b38153c0399fbb1bf6a2f5c237fdab 6e6d8802b021e36bbaad81845657769dd48a798ea33080ada05e9818a20b38f7
 lib/codeql/swift/generated/OtherAvailabilitySpec.qll 0e26a203b26ff0581b7396b0c6d1606feec5cc32477f676585cdec4911af91c5 0e26a203b26ff0581b7396b0c6d1606feec5cc32477f676585cdec4911af91c5
 lib/codeql/swift/generated/ParentChild.qll 5c5ff9812efbed0adf465d1c8b9108c893c77ff946f6feaaec7223ad38664079 94038dcd8a5e98b959ce9f09b7b54b745b0df49b91339b9396017a209abe8bb7
-lib/codeql/swift/generated/PlatformVersionAvailabilitySpec.qll f82d9ca416fe8bd59b5531b65b1c74c9f317b3297a6101544a11339a1cffce38 7f5c6d3309e66c134107afe55bae76dfc9a72cb7cdd6d4c3706b6b34cee09fa0
+lib/codeql/swift/generated/PlatformVersionAvailabilitySpec.qll f82d9ca416fe8bd59b5531b65b1c74c9f317b3297a6101544a11339a1cffce38 d21d5bfb136fe8a8bcbd39321632f52c63e62747eb831b900c23d8af3155942d
 lib/codeql/swift/generated/PureSynthConstructors.qll 173c0dd59396a1de26fe870e3bc2766c46de689da2a4d8807cb62023bbce1a98 173c0dd59396a1de26fe870e3bc2766c46de689da2a4d8807cb62023bbce1a98
-lib/codeql/swift/generated/Raw.qll 87402f6b1a0173503a545b57b06c0e320459410834c9adc7a25b2ae53874075e 49e27ddf824decdf21c0531b1ebb3fa007a869ec63bde9f60d08a68fae12acc6
+lib/codeql/swift/generated/Raw.qll 233789013a426b1c8f2d8305f644f27ab18b4568681adea4b18ee25db747f6a1 733839391db425131a3e3e6ebf1f628cac66580460d1fa062bd275445b908e55
 lib/codeql/swift/generated/Synth.qll 551fdf7e4b53f9ee1314d1bb42c2638cf82f45bfa1f40a635dfa7b6072e4418c 9ab178464700a19951fc5285acacda4913addee81515d8e072b3d7055935a814
 lib/codeql/swift/generated/SynthConstructors.qll 2f801bd8b0db829b0253cd459ed3253c1fdfc55dce68ebc53e7fec138ef0aca4 2f801bd8b0db829b0253cd459ed3253c1fdfc55dce68ebc53e7fec138ef0aca4
 lib/codeql/swift/generated/UnknownFile.qll 0fcf9beb8de79440bcdfff4bb6ab3dd139bd273e6c32754e05e6a632651e85f6 0fcf9beb8de79440bcdfff4bb6ab3dd139bd273e6c32754e05e6a632651e85f6
@@ -450,24 +450,24 @@ lib/codeql/swift/generated/expr/BridgeFromObjCExpr.qll b9a6520d01613dfb8c7606177
 lib/codeql/swift/generated/expr/BridgeToObjCExpr.qll 31ca13762aee9a6a17746f40ec4e1e929811c81fdadb27c48e0e7ce6a3a6222d 31ca13762aee9a6a17746f40ec4e1e929811c81fdadb27c48e0e7ce6a3a6222d
 lib/codeql/swift/generated/expr/BuiltinLiteralExpr.qll 052f8d0e9109a0d4496da1ae2b461417951614c88dbc9d80220908734b3f70c6 536fa290bb75deae0517d53528237eab74664958bf7fdbf8041283415dda2142
 lib/codeql/swift/generated/expr/CallExpr.qll c7dc105fcb6c0956e20d40f736db35bd7f38f41c3d872858972c2ca120110d36 c7dc105fcb6c0956e20d40f736db35bd7f38f41c3d872858972c2ca120110d36
-lib/codeql/swift/generated/expr/CaptureListExpr.qll 671234408ead93c0d6abc453f774a88f0888956e6ad08d5a1c22aec72b2eec46 601e23e0356341fd6287fb9775f0e86bca6a0de46383e0912854e045e501d42c
+lib/codeql/swift/generated/expr/CaptureListExpr.qll 300e3e7b60d49c321c9b6209ace7cd4665dc3db1b3f4227af476c3bdaf7da196 3ccc01074fa7cef8df1f2923fb3837af59360f5bd496ccbb5f0f77d02ac9311a
 lib/codeql/swift/generated/expr/CheckedCastExpr.qll 146c24e72cda519676321d3bdb89d1953dfe1810d2710f04cfdc4210ace24c40 91093e0ba88ec3621b538d98454573b5eea6d43075a2ab0a08f80f9b9be336d3
 lib/codeql/swift/generated/expr/ClassMetatypeToObjectExpr.qll 076c0f7369af3fffc8860429bd8e290962bf7fc8cf53bbba061de534e99cc8bf 076c0f7369af3fffc8860429bd8e290962bf7fc8cf53bbba061de534e99cc8bf
 lib/codeql/swift/generated/expr/ClosureExpr.qll f194fc8c5f67fcf0219e8e2de93ee2b820c27a609b2986b68d57a54445f66b61 3cae87f6c6eefb32195f06bc4c95ff6634446ecf346d3a3c94dc05c1539f3de2
 lib/codeql/swift/generated/expr/CoerceExpr.qll a2656e30dff4adc693589cab20e0419886959c821e542d7f996ab38613fa8456 a2656e30dff4adc693589cab20e0419886959c821e542d7f996ab38613fa8456
 lib/codeql/swift/generated/expr/CollectionExpr.qll 8782f55c91dc77310d9282303ba623cb852a4b5e7a8f6426e7df07a08efb8819 b2ce17bf217fe3df3da54ac2a9896ab052c1daaf5559a5c73cc866ca255a6b74
-lib/codeql/swift/generated/expr/CollectionUpcastConversionExpr.qll 2d007ed079803843a4413466988d659f78af8e6d06089ed9e22a0a8dedf78dbe ca7c3a62aa17613c5cbdc3f88ec466e7cc1d9adf5a73de917899b553c55c4c3f
-lib/codeql/swift/generated/expr/ConditionalBridgeFromObjCExpr.qll 4a21e63cc547021b70ca1b8080903997574ab5a2508a14f780ce08aa4de050de 0b89b75cce8f2a415296e3b08fa707d53d90b2c75087c74c0266c186c81b428b
+lib/codeql/swift/generated/expr/CollectionUpcastConversionExpr.qll 2d007ed079803843a4413466988d659f78af8e6d06089ed9e22a0a8dedf78dbe 38a49c14fc0f47d5a6c86fa1176bf7ae69d88a13f008c8adac9b3dc509b1917d
+lib/codeql/swift/generated/expr/ConditionalBridgeFromObjCExpr.qll 4a21e63cc547021b70ca1b8080903997574ab5a2508a14f780ce08aa4de050de 5bc488e29f5bb1fae6830285c3206ac133e5bde5c3e5e3a7c882abf827a725c3
 lib/codeql/swift/generated/expr/ConditionalCheckedCastExpr.qll 92a999dd1dcc1f498ed2e28b4d65ac697788960a66452a66b5281c287596d42b 92a999dd1dcc1f498ed2e28b4d65ac697788960a66452a66b5281c287596d42b
-lib/codeql/swift/generated/expr/CovariantFunctionConversionExpr.qll b749118590163eafbd538e71e4c903668451f52ae0dabbb13e504e7b1fefa9e1 abaf3f10d35bab1cf6ab44cb2e2eb1768938985ce00af4877d6043560a6b48ec
-lib/codeql/swift/generated/expr/CovariantReturnConversionExpr.qll f1b409f0bf54b149deb1a40fbe337579a0f6eb2498ef176ef5f64bc53e94e2fe 532d6cb2ebbb1e6da4b26df439214a5a64ec1eb8a222917ba2913f4ee8d73bd8
+lib/codeql/swift/generated/expr/CovariantFunctionConversionExpr.qll b749118590163eafbd538e71e4c903668451f52ae0dabbb13e504e7b1fefa9e1 d3af8e3beb6e395f537348d875978dfae119243dc3495c48a7c83b056aff2f6c
+lib/codeql/swift/generated/expr/CovariantReturnConversionExpr.qll f1b409f0bf54b149deb1a40fbe337579a0f6eb2498ef176ef5f64bc53e94e2fe a32992597057657c7bbf13c809db67844b834668e8d2804adabcf6187d81c244
 lib/codeql/swift/generated/expr/DeclRefExpr.qll 06149b37933848032fb6cc4692ff63ee54347cccb79e1fa150129a081afbf5d2 580392ea470c21a58021245f1d7fa08232a2f5314786ba8476282a5fbe403ffe
 lib/codeql/swift/generated/expr/DefaultArgumentExpr.qll 77468697fd5cafb05ca166a77e94ce9998c28624e235b626b9afbe1da9a93d4e d813ea7d5973945355a2941ccd3ca72e01745ab6320da429f3694e2465af96d3
 lib/codeql/swift/generated/expr/DerivedToBaseExpr.qll 5f371b5b82262efb416af1a54073079dcf857f7a744010294f79a631c76c0e68 5f371b5b82262efb416af1a54073079dcf857f7a744010294f79a631c76c0e68
 lib/codeql/swift/generated/expr/DestructureTupleExpr.qll 1214d25d0fa6a7c2f183d9b12c97c679e9b92420ca1970d802ea1fe84b42ccc8 1214d25d0fa6a7c2f183d9b12c97c679e9b92420ca1970d802ea1fe84b42ccc8
 lib/codeql/swift/generated/expr/DictionaryExpr.qll f8bab2bdf683f4974be102faea2f8ff48ede5937a9112a1fa149180143052b0a 152ae4811c5282c68b9f2eb7b123631fbe461af7a7947434abf7e523b35b27e2
-lib/codeql/swift/generated/expr/DifferentiableFunctionExpr.qll 9143e12dfe0b3b4cc2d1fe27d893498f5bd6725c31bee217ab9fa1ca5efeca7b a28c05a5c249c1f0a59ab08bf50643ef4d13ba6f54437e8fa41700d44567ec71
-lib/codeql/swift/generated/expr/DifferentiableFunctionExtractOriginalExpr.qll d90266387d6eecf2bacb2d0f5f05a2132a018f1ccf723664e314dcfd8972772d 44fe931ed622373f07fc89b1ea7c69af3f1cf3b9c5715d48d15dd2d0e49cc9dc
+lib/codeql/swift/generated/expr/DifferentiableFunctionExpr.qll 9143e12dfe0b3b4cc2d1fe27d893498f5bd6725c31bee217ab9fa1ca5efeca7b 8af001026d4b1a08d787af5146affb2df57c0432b1dfcdb557cd4de2cebe51a5
+lib/codeql/swift/generated/expr/DifferentiableFunctionExtractOriginalExpr.qll d90266387d6eecf2bacb2d0f5f05a2132a018f1ccf723664e314dcfd8972772d 878ea62a077e8cda87490bbf770ca0df68d94cbafd2576ff7b725311d73ffef7
 lib/codeql/swift/generated/expr/DiscardAssignmentExpr.qll f2cb4a5295855bcfe47a223e0ab9b915c22081fe7dddda801b360aa365604efd f2cb4a5295855bcfe47a223e0ab9b915c22081fe7dddda801b360aa365604efd
 lib/codeql/swift/generated/expr/DotSelfExpr.qll af32541b2a03d91c4b4184b8ebca50e2fe61307c2b438f50f46cd90592147425 af32541b2a03d91c4b4184b8ebca50e2fe61307c2b438f50f46cd90592147425
 lib/codeql/swift/generated/expr/DotSyntaxBaseIgnoredExpr.qll d0fc8b6e09dd76a5b7fcc7ad632520c704d8629546f42c7cf6b3fc936d1ba38d f1364fb26d3515594489485a1f3d0ab0520fb129c87ffed0d3920b754ddc7dbd
@@ -479,7 +479,7 @@ lib/codeql/swift/generated/expr/DynamicTypeExpr.qll c29baea6ec5b0b7186b675e3322c
 lib/codeql/swift/generated/expr/EnumIsCaseExpr.qll 8df7cf11dff39ec1a8498d4df4cda2ab0fb49a88aaca671c8e4fd6d53bbf2af9 e5b064938c60634eb1060d39b435913286591e1e8d506bbb19ee8faace7105c5
 lib/codeql/swift/generated/expr/ErasureExpr.qll c232bc7b612429b97dbd4bb2383c2601c7d12f63312f2c49e695c7a8a87fa72a c232bc7b612429b97dbd4bb2383c2601c7d12f63312f2c49e695c7a8a87fa72a
 lib/codeql/swift/generated/expr/ErrorExpr.qll 8e354eed5655e7261d939f3831eb6fa2961cdd2cebe41e3e3e7f54475e8a6083 8e354eed5655e7261d939f3831eb6fa2961cdd2cebe41e3e3e7f54475e8a6083
-lib/codeql/swift/generated/expr/ExistentialMetatypeToObjectExpr.qll eb0d42aac3f6331011a0e26cf5581c5e0a1b5523d2da94672abdebe70000d65b efe2bc0424e551454acc919abe4dac7fd246b84f1ae0e5d2e31a49cbcf84ce40
+lib/codeql/swift/generated/expr/ExistentialMetatypeToObjectExpr.qll eb0d42aac3f6331011a0e26cf5581c5e0a1b5523d2da94672abdebe70000d65b 0ce8b72c817161bc5c1ffc40cb778643b3694512df0502e5295afdf2987b37df
 lib/codeql/swift/generated/expr/ExplicitCastExpr.qll 162f94461d41cf10a81567e13d5141d7aca417cc92d4ef55de97c7909681882e c8e7d1f569265a9bc2ae6a82e33783ec3ac077c3ae6e582edcb49a4eb816f7b5
 lib/codeql/swift/generated/expr/ExplicitClosureExpr.qll c5291fb91e04a99133d1b4caf25f8bd6e7f2e7b9d5d99558143899f4dc9a7861 c5291fb91e04a99133d1b4caf25f8bd6e7f2e7b9d5d99558143899f4dc9a7861
 lib/codeql/swift/generated/expr/Expr.qll b09ddd296693ad78a2b0e7dc17d2b746357ae88645b046a026861eafeba616cb 498c628f904fbf48be10f32b146168b71f8f7d9f829614e422020701ccc0f8e4
@@ -487,7 +487,7 @@ lib/codeql/swift/generated/expr/FloatLiteralExpr.qll ae851773886b3d33ab5535572a4
 lib/codeql/swift/generated/expr/ForceTryExpr.qll 062997b5e9a9e993de703856ae6af60fe1950951cf77cdab11b972fb0a5a4ed3 062997b5e9a9e993de703856ae6af60fe1950951cf77cdab11b972fb0a5a4ed3
 lib/codeql/swift/generated/expr/ForceValueExpr.qll cd7ee5fa4a6f7094c7fbb9c5831f60d5ce18b123fe7beea3dcb26ca78e387118 7cdef6e9b501f9e9cb0d48828e68b349b25e4e5f312e5bcee91868ae8b196e7d
 lib/codeql/swift/generated/expr/ForcedCheckedCastExpr.qll cf4792bd4a2c5ce264de141bdbc2ec10f59f1a79a5def8c052737f67807bb8c1 cf4792bd4a2c5ce264de141bdbc2ec10f59f1a79a5def8c052737f67807bb8c1
-lib/codeql/swift/generated/expr/ForeignObjectConversionExpr.qll 243a4e14037546fcbb0afc1c3ba9e93d386780e83518b0f03383a721c68998d6 8ea334750c8797f7334f01c177382088f60ef831902abf4ff8a62c43b8be4ca5
+lib/codeql/swift/generated/expr/ForeignObjectConversionExpr.qll 243a4e14037546fcbb0afc1c3ba9e93d386780e83518b0f03383a721c68998d6 468fa46af1209c089c003a84acec449412947a6e8a3c9c31f40b4316df3877d9
 lib/codeql/swift/generated/expr/FunctionConversionExpr.qll 8f6c927adaf036358b276ad1d9069620f932fa9e0e15f77e46e5ed19318349ab 8f6c927adaf036358b276ad1d9069620f932fa9e0e15f77e46e5ed19318349ab
 lib/codeql/swift/generated/expr/IdentityExpr.qll c897dca30406cf3b7bdee32050e61d30bd3c4a6929dd085864528ed988bcd517 7a3f4eb1f59a649caf06c988e0280f41bd18e80ea4fcc803e70f60acccde27b1
 lib/codeql/swift/generated/expr/IfExpr.qll e9e69fa787640a2f510aed7a263b480cded12cb9b308a24577c742d9aa75b08a 842cef9df1510fbd21dbd10a902a820770c4bd6682035ba473776b35c2f5728d
@@ -504,8 +504,8 @@ lib/codeql/swift/generated/expr/KeyPathDotExpr.qll ea73a462801fbe5e27b2f47bca4b3
 lib/codeql/swift/generated/expr/KeyPathExpr.qll 7d088ae6d74193f06b2c121dfde182a228d5ab1498a70fd3ad7bc5cab8e76dcd 5596774318c8eed672ab360c0a1515493176d9edae64f09917ec789514928355
 lib/codeql/swift/generated/expr/LazyInitializationExpr.qll b81b831893b0f1c2bcbf48a708267cd54a86dfc6af6dde8b8b57a03e045abff2 b28cf1f4017edee09278a23f403932f91fb1a21ea83778cccf7683b5a57f6480
 lib/codeql/swift/generated/expr/LinearFunctionExpr.qll cd4c31bed9d0beb09fdfc57069d28adb3a661c064d9c6f52bb250011d8e212a7 cd4c31bed9d0beb09fdfc57069d28adb3a661c064d9c6f52bb250011d8e212a7
-lib/codeql/swift/generated/expr/LinearFunctionExtractOriginalExpr.qll ee7d3e025815b5af392ffc006ec91e3150130f2bd708ab92dbe80f2efa9e6792 bcf9ed64cca2dcf5bb544f6347de3d6faa059a1900042a36555e11dfbe0a6013
-lib/codeql/swift/generated/expr/LinearToDifferentiableFunctionExpr.qll f7aa178bff083d8e2822fda63de201d9d7f56f7f59f797ec92826001fca98143 c3ef32483f6da294c066c66b1d40159bc51366d817cf64a364f375f5e5dfa8b0
+lib/codeql/swift/generated/expr/LinearFunctionExtractOriginalExpr.qll ee7d3e025815b5af392ffc006ec91e3150130f2bd708ab92dbe80f2efa9e6792 e1646e4b50f6c4af5ed179786e4cbba33910dd642ca47959fec938770e6c7a0e
+lib/codeql/swift/generated/expr/LinearToDifferentiableFunctionExpr.qll f7aa178bff083d8e2822fda63de201d9d7f56f7f59f797ec92826001fca98143 e8da45d1f1c61936f8d2d52058ea029af13647bbb40a15e3688ece27918da365
 lib/codeql/swift/generated/expr/LiteralExpr.qll b501f426fa4e638b24d772c2ce4a4e0d40fce25b083a3eee361a66983683ee9d 068208879c86fbd5bed8290ce5962868af6c294a53ad1548cf89cf5a7f8e1781
 lib/codeql/swift/generated/expr/LoadExpr.qll 90b9ba4c96c26c476c3692b1200c31071aa10199d3e21ef386ff48b9f0b6d33a 90b9ba4c96c26c476c3692b1200c31071aa10199d3e21ef386ff48b9f0b6d33a
 lib/codeql/swift/generated/expr/LookupExpr.qll 612265f7ca68f1f62ea8ceaa74e1a876195c6c3062807b310f834aa04acfaa80 160fbb1efe0c1fb48698d786bb7f76be70b4cd96568557f90c062773fb0dff6e
@@ -529,8 +529,8 @@ lib/codeql/swift/generated/expr/ParenExpr.qll f3fb35017423ee7360cab737249c01623c
 lib/codeql/swift/generated/expr/PointerToPointerExpr.qll 7d6fa806bba09804705f9cef5be66e09cbbbbda9a4c5eae75d4380f1527bb1bd 7d6fa806bba09804705f9cef5be66e09cbbbbda9a4c5eae75d4380f1527bb1bd
 lib/codeql/swift/generated/expr/PostfixUnaryExpr.qll d1094c42aa03158bf89bace09b0a92b3056d560ebf69ddbf286accce7940d3ab d1094c42aa03158bf89bace09b0a92b3056d560ebf69ddbf286accce7940d3ab
 lib/codeql/swift/generated/expr/PrefixUnaryExpr.qll f66dee3c70ed257914de4dd4e8501bb49c9fe6c156ddad86cdcc636cf49b5f62 f66dee3c70ed257914de4dd4e8501bb49c9fe6c156ddad86cdcc636cf49b5f62
-lib/codeql/swift/generated/expr/PropertyWrapperValuePlaceholderExpr.qll 0d604764ca2e77a51b7e7062a1f57c6f46dd007717bdebf765eb7b737ef5062d cff734718467dfd4abc12dcf7e72c5745fe4e917204cdd22e42973f30eb06df7
-lib/codeql/swift/generated/expr/ProtocolMetatypeToObjectExpr.qll b692be6e5b249c095b77f4adcad5760f48bc07f6f53767ee3d236025ee4a2a51 efa47435cde494f3477164c540ac1ce0b036cb9c60f5f8ec7bfca82a88e208fb
+lib/codeql/swift/generated/expr/PropertyWrapperValuePlaceholderExpr.qll 0d604764ca2e77a51b7e7062a1f57c6f46dd007717bdebf765eb7b737ef5062d e6af6dd0e3073f4657a15c9a3b0a4e69c3673ea3113e6fee5cf216799f2a0fdf
+lib/codeql/swift/generated/expr/ProtocolMetatypeToObjectExpr.qll b692be6e5b249c095b77f4adcad5760f48bc07f6f53767ee3d236025ee4a2a51 cc69abe3cde83a4cd398ce666509326b21e7ee0b4b766c8dc0e0fea0c7d1ca91
 lib/codeql/swift/generated/expr/RebindSelfInInitializerExpr.qll 66d4cbf211cae63a443d85f83a2799cb6ac66c061e691d0531ff5edeec9af6f3 7be66e5be4c6671abcb03af92d00ce5f5ba46797941ffbb98675f6cd15db59c7
 lib/codeql/swift/generated/expr/RegexLiteralExpr.qll a11eb6f6ce7cebb35ab9ff51eae85f272980140814d7e6bded454069457a1312 bdb4bb65c9f4e187cf743ed13c0213bb7e55db9cc3adeae2169df5e32b003940
 lib/codeql/swift/generated/expr/SelfApplyExpr.qll c0815a4d6d4f08bd0c7bc170fa817ebcb2328c937c8ef16391fb0da71aff17ae 0979f035e8d4b54e93f17163a4df3c2aa65f23d56c491fa72376887e3e5c10ac
@@ -548,11 +548,11 @@ lib/codeql/swift/generated/expr/UnderlyingToOpaqueExpr.qll 13d6c7a16ec0c4c92d12e
 lib/codeql/swift/generated/expr/UnevaluatedInstanceExpr.qll 21dedc617838eed25a8d3a011296fda78f99aee0e8ae2c06789484da6886cfea 21dedc617838eed25a8d3a011296fda78f99aee0e8ae2c06789484da6886cfea
 lib/codeql/swift/generated/expr/UnresolvedDeclRefExpr.qll 17e83f6418f39cfd3b7768ba694dafce2807f97239d3ac0939fc0c3761ae3571 910e9440cae403b13b6dd501a3dbbda564a1d7d61a532e99a1825590c2d9a4ab
 lib/codeql/swift/generated/expr/UnresolvedDotExpr.qll 069ae7d5cf10c910b329252f553483a12b91fa9abee8622c096e2f7f95520c12 9a319e6da340b064042efd0ad5c4d0d55af9835053c881b1f7b43ceafd1fbb53
-lib/codeql/swift/generated/expr/UnresolvedMemberChainResultExpr.qll ce900badb9484eb2202c4df5ab11de7a3765e8e5eefaa9639779500942790ef1 c626ff29598af71151dd4395086134008951d9790aa44bcd3d4b2d91d6ca017a
+lib/codeql/swift/generated/expr/UnresolvedMemberChainResultExpr.qll ce900badb9484eb2202c4df5ab11de7a3765e8e5eefaa9639779500942790ef1 8ac96bb5d41e4808300838c0f6b8cd23b6bb9bb1ca777994d11840dc7a343ba3
 lib/codeql/swift/generated/expr/UnresolvedMemberExpr.qll 6604f7eea32c151322c446c58e91ff68f3cfbf0fc040ccee046669bcc59fb42d c7738e6b909cb621ac109235ba13ede67a10b32894fd1a5114b16d48d6e9b606
 lib/codeql/swift/generated/expr/UnresolvedPatternExpr.qll 74424b4477fae99de30141cd4f343f20d22b6420d06cd3fc3d8291b25d741dc0 840d8269b09396c7d280f2e81b87898e463fce2f585d1a147863dd27eae9905b
 lib/codeql/swift/generated/expr/UnresolvedSpecializeExpr.qll 3e5104b7539b4652d39b40e92f1e813314f9c0dc101f07568aa316a099a01de0 8f96d5b4f7407c116f990c9313534d4bcc06d3bad72269823fbad82a3a09c188
-lib/codeql/swift/generated/expr/UnresolvedTypeConversionExpr.qll a38b74b695b9a21b2f1202d4d39017c3ac401e468079477b6d4901c118ae26b6 a79fb5b50b2a50cb2508360374640817848044a203e6b2ce93d6f441a208b84d
+lib/codeql/swift/generated/expr/UnresolvedTypeConversionExpr.qll a38b74b695b9a21b2f1202d4d39017c3ac401e468079477b6d4901c118ae26b6 f8ec529a812c61e85247c4c59f240472a238f87b2001f03ad1b161392795cb9f
 lib/codeql/swift/generated/expr/VarargExpansionExpr.qll ac50264811fc0303220f7825222577c24f0752d5d7bfcb614211ca166269858d 7f11ef495d7550747afe9ddaef94d5c2b127bced88331796dc9b6a331a2db407
 lib/codeql/swift/generated/pattern/AnyPattern.qll ce091e368da281381539d17e3bac59497ad51bb9c167d8991b661db11c482775 ce091e368da281381539d17e3bac59497ad51bb9c167d8991b661db11c482775
 lib/codeql/swift/generated/pattern/BindingPattern.qll 61ae8b380b43c80710cf7d33c718c45b06cfa3680990e38e4191b3732236595c 1ff0450958cce5a5bfd00942d4846e3b2652499c738bd2790255632c883af0dd
@@ -610,7 +610,7 @@ lib/codeql/swift/generated/type/BuiltinIntegerType.qll 43be42f093054063804c275d1
 lib/codeql/swift/generated/type/BuiltinJobType.qll 4ba48722281db420aeca34fc9bb638500832d273db80337aaff0a0fa709ec873 4ba48722281db420aeca34fc9bb638500832d273db80337aaff0a0fa709ec873
 lib/codeql/swift/generated/type/BuiltinNativeObjectType.qll 7231290a65e31dbee4ec2a89b011ee1e5adb444848f6e8117e56bea0a1e11631 7231290a65e31dbee4ec2a89b011ee1e5adb444848f6e8117e56bea0a1e11631
 lib/codeql/swift/generated/type/BuiltinRawPointerType.qll bc3f6c3388c08e05d6f7d086123dc2189480dae240fcb575aef2e0f24241d207 bc3f6c3388c08e05d6f7d086123dc2189480dae240fcb575aef2e0f24241d207
-lib/codeql/swift/generated/type/BuiltinRawUnsafeContinuationType.qll f9e2ccc7c7505a44cca960c4ff32c33abbef350710bb4099dd8b7e2aaa4ba374 08fa351009a20892d1833786162fbfaced2c92dff00c4faba3c9153e6d418f67
+lib/codeql/swift/generated/type/BuiltinRawUnsafeContinuationType.qll f9e2ccc7c7505a44cca960c4ff32c33abbef350710bb4099dd8b7e2aaa4ba374 19f7e4b4e02825460374ac0d578544134a7a4d65940e32c1052e0c49b1b54aef
 lib/codeql/swift/generated/type/BuiltinType.qll 0f90f2fd18b67edf20712ff51484afd5343f95c0b1a73e4af90b0bc52aed14d9 35bb8ee31eed786a4544e6b77b3423a549330d7f1fb8c131ba728ca4db41b95f
 lib/codeql/swift/generated/type/BuiltinUnsafeValueBufferType.qll d569e7c255de5e87bb0eb68ae5e7fea011121e01b2868007485af91da7417cd6 d569e7c255de5e87bb0eb68ae5e7fea011121e01b2868007485af91da7417cd6
 lib/codeql/swift/generated/type/BuiltinVectorType.qll f51ce577abec2a1de3ae77a5cd9719aa4a1a6f3f5ec492c7444e410fb1de802a f51ce577abec2a1de3ae77a5cd9719aa4a1a6f3f5ec492c7444e410fb1de802a
@@ -629,7 +629,7 @@ lib/codeql/swift/generated/type/InOutType.qll 93906f54e2e109a8e83bf10665a9cfb518
 lib/codeql/swift/generated/type/LValueType.qll ed2c9347139582c311b6ae58a26fd4462cdcd4ec1f1d0ea3c9967d0bec54683c d027432cc73850731f33b1aaf7e2aa57d97ed7e3171de3dc53902e6ed7e38b46
 lib/codeql/swift/generated/type/MetatypeType.qll cd752f81257820f74c1f5c016e19bdc9b0f8ff8ddcc231daa68061a85c4b38e2 cd752f81257820f74c1f5c016e19bdc9b0f8ff8ddcc231daa68061a85c4b38e2
 lib/codeql/swift/generated/type/ModuleType.qll 77fc9ea296b5be29aa8eded4cdfdbc7ca09a4c443f6720f31f9728a6e5bf115d c551af9fa41b1da433f52c89e3d126ac11caad8ab6a59baeda7bdbd7b11487cf
-lib/codeql/swift/generated/type/NominalOrBoundGenericNominalType.qll 27d87dc4792b7f46fa1b708aadecef742ab2a78b23d4eb28ce392da49766122f 380b827d026202cbfcd825e975ebbdf8f53784a0426ce5454cb1b43cc42dfe16
+lib/codeql/swift/generated/type/NominalOrBoundGenericNominalType.qll 27d87dc4792b7f46fa1b708aadecef742ab2a78b23d4eb28ce392da49766122f 299c3ed5837dcb992a2a28d44ac6709c1d86a828879c62187fe29094e0e66c52
 lib/codeql/swift/generated/type/NominalType.qll f7e85d544eaaa259c727b8b4ba691578861d15612a134d19936a20943270b629 87472017a129921d2af9d380f69c293f4deba788e7660b0fe085a455e76562e8
 lib/codeql/swift/generated/type/OpaqueTypeArchetypeType.qll 54f267ce066c2bc3c1a4ef93154a2b99c1c6a7253c9d75f5d215a4e8fe036c1d f2d397bc48875d7c47e239d859a40ee191dad8340c7f2861d461c8a4f339fa49
 lib/codeql/swift/generated/type/OpenedArchetypeType.qll ed97d3fb8810424643953a0d5ebd93e58d1b2e397ea01ccde0dcd8e68c41adb2 ed97d3fb8810424643953a0d5ebd93e58d1b2e397ea01ccde0dcd8e68c41adb2
--- a/swift/ql/lib/codeql/swift/generated/PlatformVersionAvailabilitySpec.qll
+++ b/swift/ql/lib/codeql/swift/generated/PlatformVersionAvailabilitySpec.qll
@@ -8,8 +8,7 @@ module Generated {
   * An availability spec based on platform and version, for example `macOS 12` or `watchOS 14`
   */
  class PlatformVersionAvailabilitySpec extends Synth::TPlatformVersionAvailabilitySpec,
-    AvailabilitySpec
-  {
+    AvailabilitySpec {
    override string getAPrimaryQlClass() { result = "PlatformVersionAvailabilitySpec" }

    /**
--- a/swift/ql/lib/codeql/swift/generated/Raw.qll
+++ b/swift/ql/lib/codeql/swift/generated/Raw.qll
@@ -284,8 +284,7 @@ module Raw {
   * An availability spec based on platform and version, for example `macOS 12` or `watchOS 14`
   */
  class PlatformVersionAvailabilitySpec extends @platform_version_availability_spec,
-    AvailabilitySpec
-  {
+    AvailabilitySpec {
    override string toString() { result = "PlatformVersionAvailabilitySpec" }

    /**
@@ -1094,7 +1093,7 @@ module Raw {
    /**
     * Gets the closure body of this capture list expression.
     */
-    ExplicitClosureExpr getClosureBody() { capture_list_exprs(this, result) }
+    ClosureExpr getClosureBody() { capture_list_exprs(this, result) }
  }

  /**
@@ -1821,8 +1820,7 @@ module Raw {
   * INTERNAL: Do not use.
   */
  class CollectionUpcastConversionExpr extends @collection_upcast_conversion_expr,
-    ImplicitConversionExpr
-  {
+    ImplicitConversionExpr {
    override string toString() { result = "CollectionUpcastConversionExpr" }
  }

@@ -1830,8 +1828,7 @@ module Raw {
   * INTERNAL: Do not use.
   */
  class ConditionalBridgeFromObjCExpr extends @conditional_bridge_from_obj_c_expr,
-    ImplicitConversionExpr
-  {
+    ImplicitConversionExpr {
    override string toString() { result = "ConditionalBridgeFromObjCExpr" }
  }

@@ -1839,8 +1836,7 @@ module Raw {
   * INTERNAL: Do not use.
   */
  class CovariantFunctionConversionExpr extends @covariant_function_conversion_expr,
-    ImplicitConversionExpr
-  {
+    ImplicitConversionExpr {
    override string toString() { result = "CovariantFunctionConversionExpr" }
  }

@@ -1848,8 +1844,7 @@ module Raw {
   * INTERNAL: Do not use.
   */
  class CovariantReturnConversionExpr extends @covariant_return_conversion_expr,
-    ImplicitConversionExpr
-  {
+    ImplicitConversionExpr {
    override string toString() { result = "CovariantReturnConversionExpr" }
  }

@@ -1890,8 +1885,7 @@ module Raw {
   * INTERNAL: Do not use.
   */
  class DifferentiableFunctionExtractOriginalExpr extends @differentiable_function_extract_original_expr,
-    ImplicitConversionExpr
-  {
+    ImplicitConversionExpr {
    override string toString() { result = "DifferentiableFunctionExtractOriginalExpr" }
  }

@@ -1918,8 +1912,7 @@ module Raw {
   * INTERNAL: Do not use.
   */
  class ExistentialMetatypeToObjectExpr extends @existential_metatype_to_object_expr,
-    ImplicitConversionExpr
-  {
+    ImplicitConversionExpr {
    override string toString() { result = "ExistentialMetatypeToObjectExpr" }
  }

@@ -1995,8 +1988,7 @@ module Raw {
   * INTERNAL: Do not use.
   */
  class LinearFunctionExtractOriginalExpr extends @linear_function_extract_original_expr,
-    ImplicitConversionExpr
-  {
+    ImplicitConversionExpr {
    override string toString() { result = "LinearFunctionExtractOriginalExpr" }
  }

@@ -2004,8 +1996,7 @@ module Raw {
   * INTERNAL: Do not use.
   */
  class LinearToDifferentiableFunctionExpr extends @linear_to_differentiable_function_expr,
-    ImplicitConversionExpr
-  {
+    ImplicitConversionExpr {
    override string toString() { result = "LinearToDifferentiableFunctionExpr" }
  }

@@ -2122,8 +2113,7 @@ module Raw {
   * INTERNAL: Do not use.
   */
  class ProtocolMetatypeToObjectExpr extends @protocol_metatype_to_object_expr,
-    ImplicitConversionExpr
-  {
+    ImplicitConversionExpr {
    override string toString() { result = "ProtocolMetatypeToObjectExpr" }
  }

@@ -2225,8 +2215,7 @@ module Raw {
   * INTERNAL: Do not use.
   */
  class UnresolvedMemberChainResultExpr extends @unresolved_member_chain_result_expr, IdentityExpr,
-    ErrorElement
-  {
+    ErrorElement {
    override string toString() { result = "UnresolvedMemberChainResultExpr" }
  }

@@ -2234,8 +2223,7 @@ module Raw {
   * INTERNAL: Do not use.
   */
  class UnresolvedTypeConversionExpr extends @unresolved_type_conversion_expr,
-    ImplicitConversionExpr, ErrorElement
-  {
+    ImplicitConversionExpr, ErrorElement {
    override string toString() { result = "UnresolvedTypeConversionExpr" }
  }

@@ -3248,8 +3236,7 @@ module Raw {
   * INTERNAL: Do not use.
   */
  class NominalOrBoundGenericNominalType extends @nominal_or_bound_generic_nominal_type,
-    AnyGenericType
-  { }
+    AnyGenericType { }

  /**
   * INTERNAL: Do not use.
--- 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.ExplicitClosureExpr
+import codeql.swift.elements.expr.ClosureExpr
 import codeql.swift.elements.expr.Expr
 import codeql.swift.elements.decl.PatternBindingDecl

@@ -35,9 +35,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.
     */
-    ExplicitClosureExpr getImmediateClosureBody() {
+    ClosureExpr getImmediateClosureBody() {
      result =
-        Synth::convertExplicitClosureExprFromRaw(Synth::convertCaptureListExprToRaw(this)
+        Synth::convertClosureExprFromRaw(Synth::convertCaptureListExprToRaw(this)
              .(Raw::CaptureListExpr)
              .getClosureBody())
    }
@@ -45,8 +45,8 @@ module Generated {
    /**
     * Gets the closure body of this capture list expression.
     */
-    final ExplicitClosureExpr getClosureBody() {
-      exists(ExplicitClosureExpr immediate |
+    final ClosureExpr getClosureBody() {
+      exists(ClosureExpr immediate |
        immediate = this.getImmediateClosureBody() and
        if exists(this.getResolveStep()) then result = immediate else result = immediate.resolve()
      )
--- a/swift/ql/lib/codeql/swift/generated/expr/CollectionUpcastConversionExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/CollectionUpcastConversionExpr.qll
@@ -5,8 +5,7 @@ import codeql.swift.elements.expr.ImplicitConversionExpr

 module Generated {
  class CollectionUpcastConversionExpr extends Synth::TCollectionUpcastConversionExpr,
-    ImplicitConversionExpr
-  {
+    ImplicitConversionExpr {
    override string getAPrimaryQlClass() { result = "CollectionUpcastConversionExpr" }
  }
 }
--- a/swift/ql/lib/codeql/swift/generated/expr/ConditionalBridgeFromObjCExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/ConditionalBridgeFromObjCExpr.qll
@@ -5,8 +5,7 @@ import codeql.swift.elements.expr.ImplicitConversionExpr

 module Generated {
  class ConditionalBridgeFromObjCExpr extends Synth::TConditionalBridgeFromObjCExpr,
-    ImplicitConversionExpr
-  {
+    ImplicitConversionExpr {
    override string getAPrimaryQlClass() { result = "ConditionalBridgeFromObjCExpr" }
  }
 }
--- a/swift/ql/lib/codeql/swift/generated/expr/CovariantFunctionConversionExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/CovariantFunctionConversionExpr.qll
@@ -5,8 +5,7 @@ import codeql.swift.elements.expr.ImplicitConversionExpr

 module Generated {
  class CovariantFunctionConversionExpr extends Synth::TCovariantFunctionConversionExpr,
-    ImplicitConversionExpr
-  {
+    ImplicitConversionExpr {
    override string getAPrimaryQlClass() { result = "CovariantFunctionConversionExpr" }
  }
 }
--- a/swift/ql/lib/codeql/swift/generated/expr/CovariantReturnConversionExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/CovariantReturnConversionExpr.qll
@@ -5,8 +5,7 @@ import codeql.swift.elements.expr.ImplicitConversionExpr

 module Generated {
  class CovariantReturnConversionExpr extends Synth::TCovariantReturnConversionExpr,
-    ImplicitConversionExpr
-  {
+    ImplicitConversionExpr {
    override string getAPrimaryQlClass() { result = "CovariantReturnConversionExpr" }
  }
 }
--- a/swift/ql/lib/codeql/swift/generated/expr/DifferentiableFunctionExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/DifferentiableFunctionExpr.qll
@@ -5,8 +5,7 @@ import codeql.swift.elements.expr.ImplicitConversionExpr

 module Generated {
  class DifferentiableFunctionExpr extends Synth::TDifferentiableFunctionExpr,
-    ImplicitConversionExpr
-  {
+    ImplicitConversionExpr {
    override string getAPrimaryQlClass() { result = "DifferentiableFunctionExpr" }
  }
 }
--- a/swift/ql/lib/codeql/swift/generated/expr/DifferentiableFunctionExtractOriginalExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/DifferentiableFunctionExtractOriginalExpr.qll
@@ -5,8 +5,7 @@ import codeql.swift.elements.expr.ImplicitConversionExpr

 module Generated {
  class DifferentiableFunctionExtractOriginalExpr extends Synth::TDifferentiableFunctionExtractOriginalExpr,
-    ImplicitConversionExpr
-  {
+    ImplicitConversionExpr {
    override string getAPrimaryQlClass() { result = "DifferentiableFunctionExtractOriginalExpr" }
  }
 }
--- a/swift/ql/lib/codeql/swift/generated/expr/ExistentialMetatypeToObjectExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/ExistentialMetatypeToObjectExpr.qll
@@ -5,8 +5,7 @@ import codeql.swift.elements.expr.ImplicitConversionExpr

 module Generated {
  class ExistentialMetatypeToObjectExpr extends Synth::TExistentialMetatypeToObjectExpr,
-    ImplicitConversionExpr
-  {
+    ImplicitConversionExpr {
    override string getAPrimaryQlClass() { result = "ExistentialMetatypeToObjectExpr" }
  }
 }
--- a/swift/ql/lib/codeql/swift/generated/expr/ForeignObjectConversionExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/ForeignObjectConversionExpr.qll
@@ -5,8 +5,7 @@ import codeql.swift.elements.expr.ImplicitConversionExpr

 module Generated {
  class ForeignObjectConversionExpr extends Synth::TForeignObjectConversionExpr,
-    ImplicitConversionExpr
-  {
+    ImplicitConversionExpr {
    override string getAPrimaryQlClass() { result = "ForeignObjectConversionExpr" }
  }
 }
--- a/swift/ql/lib/codeql/swift/generated/expr/LinearFunctionExtractOriginalExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/LinearFunctionExtractOriginalExpr.qll
@@ -5,8 +5,7 @@ import codeql.swift.elements.expr.ImplicitConversionExpr

 module Generated {
  class LinearFunctionExtractOriginalExpr extends Synth::TLinearFunctionExtractOriginalExpr,
-    ImplicitConversionExpr
-  {
+    ImplicitConversionExpr {
    override string getAPrimaryQlClass() { result = "LinearFunctionExtractOriginalExpr" }
  }
 }
--- a/swift/ql/lib/codeql/swift/generated/expr/LinearToDifferentiableFunctionExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/LinearToDifferentiableFunctionExpr.qll
@@ -5,8 +5,7 @@ import codeql.swift.elements.expr.ImplicitConversionExpr

 module Generated {
  class LinearToDifferentiableFunctionExpr extends Synth::TLinearToDifferentiableFunctionExpr,
-    ImplicitConversionExpr
-  {
+    ImplicitConversionExpr {
    override string getAPrimaryQlClass() { result = "LinearToDifferentiableFunctionExpr" }
  }
 }
--- a/swift/ql/lib/codeql/swift/generated/expr/PropertyWrapperValuePlaceholderExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/PropertyWrapperValuePlaceholderExpr.qll
@@ -10,8 +10,7 @@ module Generated {
   * wrapper with an initializer.
   */
  class PropertyWrapperValuePlaceholderExpr extends Synth::TPropertyWrapperValuePlaceholderExpr,
-    Expr
-  {
+    Expr {
    override string getAPrimaryQlClass() { result = "PropertyWrapperValuePlaceholderExpr" }

    /**
--- a/swift/ql/lib/codeql/swift/generated/expr/ProtocolMetatypeToObjectExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/ProtocolMetatypeToObjectExpr.qll
@@ -5,8 +5,7 @@ import codeql.swift.elements.expr.ImplicitConversionExpr

 module Generated {
  class ProtocolMetatypeToObjectExpr extends Synth::TProtocolMetatypeToObjectExpr,
-    ImplicitConversionExpr
-  {
+    ImplicitConversionExpr {
    override string getAPrimaryQlClass() { result = "ProtocolMetatypeToObjectExpr" }
  }
 }
--- a/swift/ql/lib/codeql/swift/generated/expr/UnresolvedMemberChainResultExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/UnresolvedMemberChainResultExpr.qll
@@ -6,8 +6,7 @@ import codeql.swift.elements.expr.IdentityExpr

 module Generated {
  class UnresolvedMemberChainResultExpr extends Synth::TUnresolvedMemberChainResultExpr,
-    IdentityExpr, ErrorElement
-  {
+    IdentityExpr, ErrorElement {
    override string getAPrimaryQlClass() { result = "UnresolvedMemberChainResultExpr" }
  }
 }
--- a/swift/ql/lib/codeql/swift/generated/expr/UnresolvedTypeConversionExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/UnresolvedTypeConversionExpr.qll
@@ -6,8 +6,7 @@ import codeql.swift.elements.expr.ImplicitConversionExpr

 module Generated {
  class UnresolvedTypeConversionExpr extends Synth::TUnresolvedTypeConversionExpr,
-    ImplicitConversionExpr, ErrorElement
-  {
+    ImplicitConversionExpr, ErrorElement {
    override string getAPrimaryQlClass() { result = "UnresolvedTypeConversionExpr" }
  }
 }
--- a/swift/ql/lib/codeql/swift/generated/type/BuiltinRawUnsafeContinuationType.qll
+++ b/swift/ql/lib/codeql/swift/generated/type/BuiltinRawUnsafeContinuationType.qll
@@ -5,8 +5,7 @@ import codeql.swift.elements.type.BuiltinType

 module Generated {
  class BuiltinRawUnsafeContinuationType extends Synth::TBuiltinRawUnsafeContinuationType,
-    BuiltinType
-  {
+    BuiltinType {
    override string getAPrimaryQlClass() { result = "BuiltinRawUnsafeContinuationType" }
  }
 }
--- a/swift/ql/lib/codeql/swift/generated/type/NominalOrBoundGenericNominalType.qll
+++ b/swift/ql/lib/codeql/swift/generated/type/NominalOrBoundGenericNominalType.qll
@@ -5,6 +5,5 @@ import codeql.swift.elements.type.AnyGenericType

 module Generated {
  class NominalOrBoundGenericNominalType extends Synth::TNominalOrBoundGenericNominalType,
-    AnyGenericType
-  { }
+    AnyGenericType { }
 }
--- a/swift/ql/lib/swift.dbscheme
+++ b/swift/ql/lib/swift.dbscheme
@@ -829,7 +829,7 @@ bind_optional_exprs(  //dir=expr

 capture_list_exprs(  //dir=expr
  unique int id: @capture_list_expr,
-  int closure_body: @explicit_closure_expr_or_none ref
+  int closure_body: @closure_expr_or_none ref
 );

 #keyset[id, index]
@@ -2457,6 +2457,11 @@ variadic_sequence_types(  //dir=type
 | @unspecified_element
 ;

+@closure_expr_or_none =
+  @closure_expr
+| @unspecified_element
+;
+
@condition_element_or_none =
  @condition_element
 | @unspecified_element
@@ -2472,11 +2477,6 @@ variadic_sequence_types(  //dir=type
 | @unspecified_element
 ;

-@explicit_closure_expr_or_none =
-  @explicit_closure_expr
-| @unspecified_element
-;
-
@expr_or_none =
  @expr
 | @unspecified_element
--- a/swift/ql/test/extractor-tests/errors/Errors.ql
+++ b/swift/ql/test/extractor-tests/errors/Errors.ql
@@ -1,5 +1,6 @@
 import swift
+import TestUtils

 from Locatable e
-where e instanceof ErrorElement
+where e instanceof ErrorElement and toBeTested(e)
 select e, e.getPrimaryQlClasses()
--- a/swift/ql/test/extractor-tests/generated/decl/NamedFunction/NamedFunction_getParam.expected
+++ b/swift/ql/test/extractor-tests/generated/decl/NamedFunction/NamedFunction_getParam.expected
@@ -1,6 +1,6 @@
 | functions.swift:5:1:7:1 | bar(_:d:) | 0 | functions.swift:5:10:5:15 | x |
 | functions.swift:5:1:7:1 | bar(_:d:) | 1 | functions.swift:5:20:5:25 | y |
 | functions.swift:10:5:10:28 | noBody(x:) | 0 | functions.swift:10:17:10:20 | x |
-| functions.swift:13:1:15:1 | variadic(_:) | 0 | functions.swift:13:15:13:23 | ints |
+| functions.swift:13:1:15:1 | variadic(_:) | 0 | functions.swift:13:15:13:26 | ints |
 | functions.swift:17:1:19:1 | generic(x:y:) | 0 | functions.swift:17:20:17:23 | x |
 | functions.swift:17:1:19:1 | generic(x:y:) | 1 | functions.swift:17:26:17:29 | y |
--- a/swift/ql/test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr.expected
+++ b/swift/ql/test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr.expected
@@ -9,8 +9,7 @@
 | method_lookups.swift:33:3:33:5 | .bar() | hasType: | yes | getBase: | method_lookups.swift:33:3:33:3 | X.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:33:5:33:5 | bar() |
 | method_lookups.swift:34:3:34:3 | X.init() | hasType: | yes | getBase: | method_lookups.swift:34:3:34:3 | X.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:34:3:34:3 | X.init() |
 | method_lookups.swift:34:3:34:7 | .baz(_:) | hasType: | yes | getBase: | method_lookups.swift:34:3:34:5 | call to X.init() | hasMember: | yes | getMethodRef: | method_lookups.swift:34:7:34:7 | baz(_:) |
-| method_lookups.swift:36:11:36:13 | (no string representation) | hasType: | yes | getBase: | method_lookups.swift:36:11:36:11 | X.Type | hasMember: | no | getMethodRef: | method_lookups.swift:36:13:36:13 | { ... } |
-| method_lookups.swift:36:13:36:13 | .bar() | hasType: | yes | getBase: | file://:0:0:0:0 | self | hasMember: | yes | getMethodRef: | method_lookups.swift:36:13:36:13 | bar() |
+| method_lookups.swift:36:11:36:13 | .bar() | hasType: | yes | getBase: | method_lookups.swift:36:11:36:11 | X.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:36:13:36:13 | bar() |
 | method_lookups.swift:37:11:37:11 | X.init() | hasType: | yes | getBase: | method_lookups.swift:37:11:37:11 | X.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:37:11:37:11 | X.init() |
 | method_lookups.swift:37:11:37:15 | (no string representation) | hasType: | yes | getBase: | method_lookups.swift:37:11:37:13 | call to X.init() | hasMember: | no | getMethodRef: | method_lookups.swift:37:15:37:15 | { ... } |
 | method_lookups.swift:37:15:37:15 | .baz(_:) | hasType: | yes | getBase: | file://:0:0:0:0 | self | hasMember: | yes | getMethodRef: | method_lookups.swift:37:15:37:15 | baz(_:) |
@@ -18,15 +17,13 @@
 | method_lookups.swift:41:3:41:5 | .foo(_:_:) | hasType: | yes | getBase: | method_lookups.swift:41:3:41:3 | Y.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:41:5:41:5 | foo(_:_:) |
 | method_lookups.swift:42:9:42:9 | Y.init() | hasType: | yes | getBase: | method_lookups.swift:42:9:42:9 | Y.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:42:9:42:9 | Y.init() |
 | method_lookups.swift:42:9:42:13 | .baz(_:) | hasType: | yes | getBase: | method_lookups.swift:42:9:42:11 | call to Y.init() | hasMember: | yes | getMethodRef: | method_lookups.swift:42:13:42:13 | baz(_:) |
-| method_lookups.swift:44:11:44:13 | (no string representation) | hasType: | yes | getBase: | method_lookups.swift:44:11:44:11 | Y.Type | hasMember: | no | getMethodRef: | method_lookups.swift:44:13:44:13 | { ... } |
-| method_lookups.swift:44:13:44:13 | .foo(_:_:) | hasType: | yes | getBase: | file://:0:0:0:0 | self | hasMember: | yes | getMethodRef: | method_lookups.swift:44:13:44:13 | foo(_:_:) |
+| method_lookups.swift:44:11:44:13 | .foo(_:_:) | hasType: | yes | getBase: | method_lookups.swift:44:11:44:11 | Y.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:44:13:44:13 | foo(_:_:) |
 | method_lookups.swift:47:1:47:1 | Task<Success, Never>.init(priority:operation:) | hasType: | yes | getBase: | method_lookups.swift:47:1:47:1 | Task<(), Never>.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:47:1:47:1 | Task<Success, Never>.init(priority:operation:) |
 | method_lookups.swift:48:9:48:11 | .foo(_:_:) | hasType: | yes | getBase: | method_lookups.swift:48:9:48:9 | Z.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:48:11:48:11 | foo(_:_:) |
 | method_lookups.swift:49:9:49:11 | .bar() | hasType: | yes | getBase: | method_lookups.swift:49:9:49:9 | Z.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:49:11:49:11 | bar() |
 | method_lookups.swift:50:9:50:9 | Z.init() | hasType: | yes | getBase: | method_lookups.swift:50:9:50:9 | Z.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:50:9:50:9 | Z.init() |
 | method_lookups.swift:50:9:50:13 | .baz(_:) | hasType: | yes | getBase: | method_lookups.swift:50:9:50:11 | call to Z.init() | hasMember: | yes | getMethodRef: | method_lookups.swift:50:13:50:13 | baz(_:) |
-| method_lookups.swift:52:11:52:13 | (no string representation) | hasType: | yes | getBase: | method_lookups.swift:52:11:52:11 | Z.Type | hasMember: | no | getMethodRef: | method_lookups.swift:52:13:52:13 | { ... } |
-| method_lookups.swift:52:13:52:13 | .bar() | hasType: | yes | getBase: | file://:0:0:0:0 | self | hasMember: | yes | getMethodRef: | method_lookups.swift:52:13:52:13 | bar() |
+| method_lookups.swift:52:11:52:13 | .bar() | hasType: | yes | getBase: | method_lookups.swift:52:11:52:11 | Z.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:52:13:52:13 | bar() |
 | method_lookups.swift:53:11:53:23 | (no string representation) | hasType: | yes | getBase: | method_lookups.swift:53:18:53:20 | call to Z.init() | hasMember: | no | getMethodRef: | method_lookups.swift:53:23:53:23 | { ... } |
 | method_lookups.swift:53:18:53:18 | Z.init() | hasType: | yes | getBase: | method_lookups.swift:53:18:53:18 | Z.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:53:18:53:18 | Z.init() |
 | method_lookups.swift:53:23:53:23 | .baz(_:) | hasType: | yes | getBase: | file://:0:0:0:0 | self | hasMember: | yes | getMethodRef: | method_lookups.swift:53:23:53:23 | baz(_:) |
--- a/swift/ql/test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr_getMember.expected
+++ b/swift/ql/test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr_getMember.expected
@@ -6,19 +6,19 @@
 | method_lookups.swift:33:3:33:5 | .bar() | method_lookups.swift:3:3:3:21 | bar() |
 | method_lookups.swift:34:3:34:3 | X.init() | method_lookups.swift:6:3:8:3 | X.init() |
 | method_lookups.swift:34:3:34:7 | .baz(_:) | method_lookups.swift:4:3:4:21 | baz(_:) |
-| method_lookups.swift:36:13:36:13 | .bar() | method_lookups.swift:3:3:3:21 | bar() |
+| method_lookups.swift:36:11:36:13 | .bar() | method_lookups.swift:3:3:3:21 | bar() |
 | method_lookups.swift:37:11:37:11 | X.init() | method_lookups.swift:6:3:8:3 | X.init() |
 | method_lookups.swift:37:15:37:15 | .baz(_:) | method_lookups.swift:4:3:4:21 | baz(_:) |
 | method_lookups.swift:40:1:40:1 | Task<Success, Never>.init(priority:operation:) | file://:0:0:0:0 | Task<Success, Never>.init(priority:operation:) |
 | method_lookups.swift:41:3:41:5 | .foo(_:_:) | method_lookups.swift:12:3:12:35 | foo(_:_:) |
 | method_lookups.swift:42:9:42:9 | Y.init() | method_lookups.swift:15:3:17:3 | Y.init() |
 | method_lookups.swift:42:9:42:13 | .baz(_:) | method_lookups.swift:13:3:13:21 | baz(_:) |
-| method_lookups.swift:44:13:44:13 | .foo(_:_:) | method_lookups.swift:12:3:12:35 | foo(_:_:) |
+| method_lookups.swift:44:11:44:13 | .foo(_:_:) | method_lookups.swift:12:3:12:35 | foo(_:_:) |
 | method_lookups.swift:47:1:47:1 | Task<Success, Never>.init(priority:operation:) | file://:0:0:0:0 | Task<Success, Never>.init(priority:operation:) |
 | method_lookups.swift:48:9:48:11 | .foo(_:_:) | method_lookups.swift:22:3:22:35 | foo(_:_:) |
 | method_lookups.swift:49:9:49:11 | .bar() | method_lookups.swift:23:3:23:21 | bar() |
 | method_lookups.swift:50:9:50:9 | Z.init() | method_lookups.swift:26:3:28:3 | Z.init() |
 | method_lookups.swift:50:9:50:13 | .baz(_:) | method_lookups.swift:24:3:24:21 | baz(_:) |
-| method_lookups.swift:52:13:52:13 | .bar() | method_lookups.swift:23:3:23:21 | bar() |
+| method_lookups.swift:52:11:52:13 | .bar() | method_lookups.swift:23:3:23:21 | bar() |
 | method_lookups.swift:53:18:53:18 | Z.init() | method_lookups.swift:26:3:28:3 | Z.init() |
 | method_lookups.swift:53:23:53:23 | .baz(_:) | method_lookups.swift:24:3:24:21 | baz(_:) |
--- a/swift/ql/test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr_getType.expected
+++ b/swift/ql/test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr_getType.expected
@@ -9,8 +9,7 @@
 | method_lookups.swift:33:3:33:5 | .bar() | () -> () |
 | method_lookups.swift:34:3:34:3 | X.init() | () -> X |
 | method_lookups.swift:34:3:34:7 | .baz(_:) | (Int) -> () |
-| method_lookups.swift:36:11:36:13 | (no string representation) | () -> () |
-| method_lookups.swift:36:13:36:13 | .bar() | () -> () |
+| method_lookups.swift:36:11:36:13 | .bar() | () -> () |
 | method_lookups.swift:37:11:37:11 | X.init() | () -> X |
 | method_lookups.swift:37:11:37:15 | (no string representation) | (Int) -> () |
 | method_lookups.swift:37:15:37:15 | .baz(_:) | (Int) -> () |
@@ -18,15 +17,13 @@
 | method_lookups.swift:41:3:41:5 | .foo(_:_:) | (Int, Int) -> () |
 | method_lookups.swift:42:9:42:9 | Y.init() | () -> Y |
 | method_lookups.swift:42:9:42:13 | .baz(_:) | (Int) -> () |
-| method_lookups.swift:44:11:44:13 | (no string representation) | (Int, Int) -> () |
-| method_lookups.swift:44:13:44:13 | .foo(_:_:) | (Int, Int) -> () |
+| method_lookups.swift:44:11:44:13 | .foo(_:_:) | (Int, Int) -> () |
 | method_lookups.swift:47:1:47:1 | Task<Success, Never>.init(priority:operation:) | (TaskPriority?, __owned @escaping @Sendable () async -> ()) -> Task<(), Never> |
 | method_lookups.swift:48:9:48:11 | .foo(_:_:) | @MainActor (Int, Int) -> () |
 | method_lookups.swift:49:9:49:11 | .bar() | @MainActor () -> () |
 | method_lookups.swift:50:9:50:9 | Z.init() | @MainActor () -> Z |
 | method_lookups.swift:50:9:50:13 | .baz(_:) | @MainActor (Int) -> () |
-| method_lookups.swift:52:11:52:13 | (no string representation) | @MainActor () -> () |
-| method_lookups.swift:52:13:52:13 | .bar() | () -> () |
+| method_lookups.swift:52:11:52:13 | .bar() | () -> () |
 | method_lookups.swift:53:11:53:23 | (no string representation) | @MainActor (Int) -> () |
 | method_lookups.swift:53:18:53:18 | Z.init() | @MainActor () -> Z |
 | method_lookups.swift:53:23:53:23 | .baz(_:) | (Int) -> () |
--- a/swift/ql/test/extractor-tests/updates/PrintAst.expected
+++ b/swift/ql/test/extractor-tests/updates/PrintAst.expected
@@ -0,0 +1,256 @@
+v5.8.swift:
+#    1| [Comment] // https://github.com/apple/swift/blob/main/CHANGELOG.md#swift-58
+#    1| 
+#    4| [StructDecl] Temperature
+#    5|   getMember(0): [PatternBindingDecl] var ... = ...
+#    5|     getPattern(0): [TypedPattern] ... as ...
+#    5|       getSubPattern(): [NamedPattern] degreesCelsius
+#    5|       getTypeRepr(): [TypeRepr] Double
+#    5|   getMember(1): [ConcreteVarDecl] degreesCelsius
+#    5|       Type = Double
+#    5|     getAccessorDecl(0): [AccessorDecl] get
+#    5|         InterfaceType = (Temperature) -> () -> Double
+#    5|       getSelfParam(): [ParamDecl] self
+#    5|           Type = Temperature
+#    5|       getBody(): [BraceStmt] { ... }
+#-----|         getElement(0): [ReturnStmt] return ...
+#-----|           getResult(): [MemberRefExpr] .degreesCelsius
+#-----|             getBase(): [DeclRefExpr] self
+#    5|     getAccessorDecl(1): [AccessorDecl] set
+#    5|         InterfaceType = (inout Temperature) -> (Double) -> ()
+#    5|       getSelfParam(): [ParamDecl] self
+#    5|           Type = Temperature
+#    5|       getParam(0): [ParamDecl] value
+#    5|           Type = Double
+#    5|       getBody(): [BraceStmt] { ... }
+#-----|         getElement(0): [AssignExpr]  ... = ...
+#-----|           getDest(): [MemberRefExpr] .degreesCelsius
+#-----|             getBase(): [DeclRefExpr] self
+#-----|           getSource(): [DeclRefExpr] value
+#    5|     getAccessorDecl(2): [AccessorDecl] _modify
+#    5|         InterfaceType = (inout Temperature) -> () -> ()
+#    5|       getSelfParam(): [ParamDecl] self
+#    5|           Type = Temperature
+#    5|       getBody(): [BraceStmt] { ... }
+#    5|         getElement(0): [YieldStmt] yield ...
+#-----|           getResult(0): [InOutExpr] &...
+#-----|             getSubExpr(): [MemberRefExpr] .degreesCelsius
+#-----|               getBase(): [DeclRefExpr] self
+#    4|   getMember(2): [ConstructorDecl] Temperature.init(degreesCelsius:)
+#    4|       InterfaceType = (Temperature.Type) -> (Double) -> Temperature
+#    4|     getSelfParam(): [ParamDecl] self
+#    4|         Type = Temperature
+#    4|     getParam(0): [ParamDecl] degreesCelsius
+#    4|         Type = Double
+#    7| [Comment] // ...
+#    7| 
+#   10| [ExtensionDecl] extension of Temperature
+#   13|   getMember(0): [PatternBindingDecl] var ... = ...
+#   13|     getPattern(0): [TypedPattern] ... as ...
+#   13|       getSubPattern(): [NamedPattern] degreesFahrenheit
+#   13|       getTypeRepr(): [TypeRepr] Double
+#   13|   getMember(1): [ConcreteVarDecl] degreesFahrenheit
+#   13|       Type = Double
+#   13|     getAccessorDecl(0): [AccessorDecl] get
+#   13|         InterfaceType = (Temperature) -> () -> Double
+#   13|       getSelfParam(): [ParamDecl] self
+#   13|           Type = Temperature
+#   13|       getBody(): [BraceStmt] { ... }
+#   14|         getElement(0): [ReturnStmt] return ...
+#   14|           getResult(): [BinaryExpr] ... .+(_:_:) ...
+#   14|             getFunction(): [MethodLookupExpr] .+(_:_:)
+#   14|               getBase(): [TypeExpr] Double.Type
+#   14|                 getTypeRepr(): [TypeRepr] Double
+#   14|               getMethodRef(): [DeclRefExpr] +(_:_:)
+#   14|             getArgument(0): [Argument] : ... ./(_:_:) ...
+#   14|               getExpr(): [BinaryExpr] ... ./(_:_:) ...
+#   14|                 getFunction(): [MethodLookupExpr] ./(_:_:)
+#   14|                   getBase(): [TypeExpr] Double.Type
+#   14|                     getTypeRepr(): [TypeRepr] Double
+#   14|                   getMethodRef(): [DeclRefExpr] /(_:_:)
+#   14|                 getArgument(0): [Argument] : ... .*(_:_:) ...
+#   14|                   getExpr(): [BinaryExpr] ... .*(_:_:) ...
+#   14|                     getFunction(): [MethodLookupExpr] .*(_:_:)
+#   14|                       getBase(): [TypeExpr] Double.Type
+#   14|                         getTypeRepr(): [TypeRepr] Double
+#   14|                       getMethodRef(): [DeclRefExpr] *(_:_:)
+#   14|                     getArgument(0): [Argument] : .degreesCelsius
+#   14|                       getExpr(): [MemberRefExpr] .degreesCelsius
+#   14|                         getBase(): [DeclRefExpr] self
+#   14|                     getArgument(1): [Argument] : 9
+#   14|                       getExpr(): [IntegerLiteralExpr] 9
+#   14|                 getArgument(1): [Argument] : 5
+#   14|                   getExpr(): [IntegerLiteralExpr] 5
+#   14|               getExpr().getFullyConverted(): [ParenExpr] (...)
+#   14|             getArgument(1): [Argument] : 32
+#   14|               getExpr(): [IntegerLiteralExpr] 32
+#   18| [ConcreteFuncDecl] collectionDowncast(_:)
+#   18|     InterfaceType = ([Any]) -> ()
+#   18|   getParam(0): [ParamDecl] arr
+#   18|       Type = [Any]
+#   18|   getBody(): [BraceStmt] { ... }
+#   19|     getElement(0): [SwitchStmt] switch arr { ... }
+#   19|       getExpr(): [DeclRefExpr] arr
+#   20|       getCase(0): [CaseStmt] case ...
+#   21|         getBody(): [BraceStmt] { ... }
+#   21|           getElement(0): [IntegerLiteralExpr] 0
+#   20|         getLabel(0): [CaseLabelItem] ... is ...
+#   20|           getPattern(): [IsPattern] ... is ...
+#   20|             getCastTypeRepr(): [TypeRepr] [Int]
+#   20|             getSubPattern(): [NamedPattern] ints
+#   20|           getPattern().getFullyUnresolved(): [BindingPattern] let ...
+#   22|       getCase(1): [CaseStmt] case ...
+#   23|         getBody(): [BraceStmt] { ... }
+#   23|           getElement(0): [IntegerLiteralExpr] 1
+#   22|         getLabel(0): [CaseLabelItem] ... is ...
+#   22|           getPattern(): [IsPattern] ... is ...
+#   22|             getCastTypeRepr(): [TypeRepr] [Bool]
+#   24|       getCase(2): [CaseStmt] case ...
+#   25|         getBody(): [BraceStmt] { ... }
+#   25|           getElement(0): [IntegerLiteralExpr] 2
+#   24|         getLabel(0): [CaseLabelItem] _
+#   24|           getPattern(): [AnyPattern] _
+#   20| [ConcreteVarDecl] ints
+#   20|     Type = [Int]
+#   29| [StructDecl] Button
+#   30|   getMember(0): [PatternBindingDecl] var ... = ...
+#-----|     getInit(0): [NilLiteralExpr] nil
+#   30|     getPattern(0): [TypedPattern] ... as ...
+#   30|       getSubPattern(): [NamedPattern] tapHandler
+#   30|       getTypeRepr(): [TypeRepr] (() -> ())?
+#   30|   getMember(1): [ConcreteVarDecl] tapHandler
+#   30|       Type = (() -> ())?
+#   30|     getAccessorDecl(0): [AccessorDecl] get
+#   30|         InterfaceType = (Button) -> () -> (() -> ())?
+#   30|       getSelfParam(): [ParamDecl] self
+#   30|           Type = Button
+#   30|       getBody(): [BraceStmt] { ... }
+#-----|         getElement(0): [ReturnStmt] return ...
+#-----|           getResult(): [MemberRefExpr] .tapHandler
+#-----|             getBase(): [DeclRefExpr] self
+#   30|     getAccessorDecl(1): [AccessorDecl] set
+#   30|         InterfaceType = (inout Button) -> ((() -> ())?) -> ()
+#   30|       getSelfParam(): [ParamDecl] self
+#   30|           Type = Button
+#   30|       getParam(0): [ParamDecl] value
+#   30|           Type = (() -> ())?
+#   30|       getBody(): [BraceStmt] { ... }
+#-----|         getElement(0): [AssignExpr]  ... = ...
+#-----|           getDest(): [MemberRefExpr] .tapHandler
+#-----|             getBase(): [DeclRefExpr] self
+#-----|           getSource(): [DeclRefExpr] value
+#   30|     getAccessorDecl(2): [AccessorDecl] _modify
+#   30|         InterfaceType = (inout Button) -> () -> ()
+#   30|       getSelfParam(): [ParamDecl] self
+#   30|           Type = Button
+#   30|       getBody(): [BraceStmt] { ... }
+#   30|         getElement(0): [YieldStmt] yield ...
+#-----|           getResult(0): [InOutExpr] &...
+#-----|             getSubExpr(): [MemberRefExpr] .tapHandler
+#-----|               getBase(): [DeclRefExpr] self
+#   29|   getMember(2): [ConstructorDecl] Button.init()
+#   29|       InterfaceType = (Button.Type) -> () -> Button
+#   29|     getSelfParam(): [ParamDecl] self
+#   29|         Type = Button
+#   29|     getBody(): [BraceStmt] { ... }
+#   29|       getElement(0): [ReturnStmt] return
+#   29|   getMember(3): [ConstructorDecl] Button.init(tapHandler:)
+#   29|       InterfaceType = (Button.Type) -> ((() -> ())?) -> Button
+#   29|     getSelfParam(): [ParamDecl] self
+#   29|         Type = Button
+#   29|     getParam(0): [ParamDecl] tapHandler
+#   29|         Type = (() -> ())?
+#   33| [ClassDecl] ViewController
+#   34|   getMember(0): [PatternBindingDecl] var ... = ...
+#   34|     getInit(0): [CallExpr] call to Button.init()
+#   34|       getFunction(): [MethodLookupExpr] Button.init()
+#   34|         getBase(): [TypeExpr] Button.Type
+#   34|           getTypeRepr(): [TypeRepr] Button
+#   34|         getMethodRef(): [DeclRefExpr] Button.init()
+#   34|     getPattern(0): [TypedPattern] ... as ...
+#   34|       getSubPattern(): [NamedPattern] button
+#   34|       getTypeRepr(): [TypeRepr] Button
+#   34|   getMember(1): [ConcreteVarDecl] button
+#   34|       Type = Button
+#   34|     getAccessorDecl(0): [AccessorDecl] get
+#   34|         InterfaceType = (ViewController) -> () -> Button
+#   34|       getSelfParam(): [ParamDecl] self
+#   34|           Type = ViewController
+#   34|       getBody(): [BraceStmt] { ... }
+#-----|         getElement(0): [ReturnStmt] return ...
+#-----|           getResult(): [MemberRefExpr] .button
+#-----|             getBase(): [DeclRefExpr] self
+#   34|     getAccessorDecl(1): [AccessorDecl] set
+#   34|         InterfaceType = (ViewController) -> (Button) -> ()
+#   34|       getSelfParam(): [ParamDecl] self
+#   34|           Type = ViewController
+#   34|       getParam(0): [ParamDecl] value
+#   34|           Type = Button
+#   34|       getBody(): [BraceStmt] { ... }
+#-----|         getElement(0): [AssignExpr]  ... = ...
+#-----|           getDest(): [MemberRefExpr] .button
+#-----|             getBase(): [DeclRefExpr] self
+#-----|           getSource(): [DeclRefExpr] value
+#   34|     getAccessorDecl(2): [AccessorDecl] _modify
+#   34|         InterfaceType = (ViewController) -> () -> ()
+#   34|       getSelfParam(): [ParamDecl] self
+#   34|           Type = ViewController
+#   34|       getBody(): [BraceStmt] { ... }
+#   34|         getElement(0): [YieldStmt] yield ...
+#-----|           getResult(0): [InOutExpr] &...
+#-----|             getSubExpr(): [MemberRefExpr] .button
+#-----|               getBase(): [DeclRefExpr] self
+#   36|   getMember(2): [ConcreteFuncDecl] setup()
+#   36|       InterfaceType = (ViewController) -> () -> ()
+#   36|     getSelfParam(): [ParamDecl] self
+#   36|         Type = ViewController
+#   36|     getBody(): [BraceStmt] { ... }
+#   37|       getElement(0): [AssignExpr]  ... = ...
+#   37|         getDest(): [MemberRefExpr] .tapHandler
+#   37|           getBase(): [MemberRefExpr] .button
+#   37|             getBase(): [DeclRefExpr] self
+#   37|         getSource(): [CaptureListExpr] { ... }
+#   37|           getBindingDecl(0): [PatternBindingDecl] var ... = ...
+#   37|             getInit(0): [DeclRefExpr] self
+#   37|             getInit(0).getFullyConverted(): [InjectIntoOptionalExpr] (ViewController?) ...
+#   37|             getPattern(0): [NamedPattern] self
+#   37|           getClosureBody(): [ClosureExpr] { ... }
+#   37|             getBody(): [BraceStmt] { ... }
+#   38|               getElement(0): [GuardStmt] guard ... else { ... }
+#   38|                 getCondition(): [StmtCondition] StmtCondition
+#   38|                   getElement(0): [ConditionElement] let ...? = ... 
+#   38|                     getPattern(): [OptionalSomePattern] let ...?
+#   38|                       getSubPattern(): [NamedPattern] self
+#   38|                       getSubPattern().getFullyUnresolved(): [BindingPattern] let ...
+#   38|                     getInitializer(): [DeclRefExpr] self
+#   38|                     getInitializer().getFullyConverted(): [LoadExpr] (ViewController?) ...
+#   38|                 getBody(): [BraceStmt] { ... }
+#   38|                   getElement(0): [ReturnStmt] return
+#   39|               getElement(1): [CallExpr] call to dismiss()
+#   39|                 getFunction(): [MethodLookupExpr] .dismiss()
+#   39|                   getBase(): [DeclRefExpr] self
+#   39|                   getMethodRef(): [DeclRefExpr] dismiss()
+#   38|             getCapture(0): [CapturedDecl] self
+#   37|         getSource().getFullyConverted(): [InjectIntoOptionalExpr] ((() -> ())?) ...
+#   43|   getMember(3): [ConcreteFuncDecl] dismiss()
+#   43|       InterfaceType = (ViewController) -> () -> ()
+#   43|     getSelfParam(): [ParamDecl] self
+#   43|         Type = ViewController
+#   43|     getBody(): [BraceStmt] { ... }
+#   33|   getMember(4): [DestructorDecl] ViewController.deinit()
+#   33|       InterfaceType = (ViewController) -> () -> ()
+#   33|     getSelfParam(): [ParamDecl] self
+#   33|         Type = ViewController
+#   33|     getBody(): [BraceStmt] { ... }
+#   33|   getMember(5): [ConstructorDecl] ViewController.init()
+#   33|       InterfaceType = (ViewController.Type) -> () -> ViewController
+#   33|     getSelfParam(): [ParamDecl] self
+#   33|         Type = ViewController
+#   33|     getBody(): [BraceStmt] { ... }
+#   33|       getElement(0): [ReturnStmt] return
+#   37| [ConcreteVarDecl] self
+#   37|     Type = ViewController?
+#   38| [ConcreteVarDecl] self
+#   38|     Type = ViewController
+#   39| [Comment] // refers to `self.dismiss()`
+#   39| 
--- a/swift/ql/test/extractor-tests/updates/PrintAst.qlref
+++ b/swift/ql/test/extractor-tests/updates/PrintAst.qlref
@@ -0,0 +1 @@
+library-tests/ast/PrintAst.ql
--- a/swift/ql/test/extractor-tests/updates/v5.8.swift
+++ b/swift/ql/test/extractor-tests/updates/v5.8.swift
@@ -0,0 +1,44 @@
+// https://github.com/apple/swift/blob/main/CHANGELOG.md#swift-58
+
+@available(macOS 12, *)
+public struct Temperature {
+    public var degreesCelsius: Double
+
+    // ...
+}
+
+extension Temperature {
+    @available(macOS 12, *)
+    @backDeployed(before: macOS 13)
+    public var degreesFahrenheit: Double {
+        return (degreesCelsius * 9 / 5) + 32
+    }
+}
+
+func collectionDowncast(_ arr: [Any]) {
+    switch arr {
+    case let ints as [Int]:
+            0
+    case is [Bool]:
+            1
+    case _:
+            2
+    }
+}
+
+struct Button {
+    var tapHandler: (() -> ())?
+}
+
+class ViewController {
+    var button: Button = Button()
+
+    func setup() {
+        button.tapHandler = { [weak self] in
+            guard let self else { return }
+            dismiss() // refers to `self.dismiss()`
+        }
+    }
+
+    func dismiss() {}
+}
--- a/swift/ql/test/library-tests/ast/PrintAst.expected
+++ b/swift/ql/test/library-tests/ast/PrintAst.expected
@@ -2476,7 +2476,7 @@ cfg.swift:
 #  377|         Type = Derived
 #-----|     getParam(0): [ParamDecl] n
 #-----|         Type = Int
-#-----|     getBody(): [BraceStmt] { ... }
+#  377|     getBody(): [BraceStmt] { ... }
 #  377|       getElement(0): [CallExpr] call to _unimplementedInitializer(className:initName:file:line:column:)
 #  377|         getFunction(): [DeclRefExpr] _unimplementedInitializer(className:initName:file:line:column:)
 #  377|         getArgument(0): [Argument] : cfg.Derived
@@ -4769,7 +4769,7 @@ expressions.swift:
 #   77|         Type = Derived
 #-----|     getParam(0): [ParamDecl] x
 #-----|         Type = Int
-#-----|     getBody(): [BraceStmt] { ... }
+#   77|     getBody(): [BraceStmt] { ... }
 #   77|       getElement(0): [CallExpr] call to _unimplementedInitializer(className:initName:file:line:column:)
 #   77|         getFunction(): [DeclRefExpr] _unimplementedInitializer(className:initName:file:line:column:)
 #   77|         getArgument(0): [Argument] : expressions.Derived
--- a/swift/schema.py
+++ b/swift/schema.py
@@ -398,7 +398,7 @@ class CapturedDecl(Decl):

 class CaptureListExpr(Expr):
    binding_decls: list[PatternBindingDecl] | child
-    closure_body: "ExplicitClosureExpr" | child
+    closure_body: "ClosureExpr" | child

 class CollectionExpr(Expr):
    pass
--- a/swift/third_party/BUILD.swift-llvm-support.bazel
+++ b/swift/third_party/BUILD.swift-llvm-support.bazel
@@ -2,22 +2,7 @@ load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")

 cc_library(
    name = "swift-llvm-support",
-    srcs = [
-        "libCodeQLSwiftFrontendTool.a",
-    ] + select({
-        "@platforms//os:linux": [
-            "libCodeQLSwiftFrontendTool.so",
-            "libswiftCore.so",
-        ],
-        "@platforms//os:macos": [
-            "libCodeQLSwiftFrontendTool.dylib",
-            "libswiftCore.dylib",
-            "libswiftCompatibility50.a",
-            "libswiftCompatibility51.a",
-            "libswiftCompatibilityConcurrency.a",
-            "libswiftCompatibilityDynamicReplacements.a",
-        ],
-    }),
+    srcs = glob(["*.a", "*.so", "*.dylib"]),
    hdrs = glob(["include/**/*", "stdlib/**/*" ]),
    linkopts = [
        "-lm",
@@ -34,7 +19,7 @@ cc_library(
        ],
        "//conditions:default": [],
    }),
-    includes = [ "include" ],
+    includes = ["include", "stdlib/public/SwiftShims"],
    visibility = ["//visibility:public"],
 )

--- a/swift/third_party/load.bzl
+++ b/swift/third_party/load.bzl
@@ -1,11 +1,11 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")

-_swift_prebuilt_version = "swift-5.7.3-RELEASE.142"
+_swift_prebuilt_version = "swift-5.8-RELEASE.202"
 _swift_sha_map = {
-    "Linux-X64": "398d8de54c8775c939dff95ed5bb0e04a9308a1982b4c1900cd4a5d01223f63b",
-    "macOS-ARM64": "397dd67ea99b9c9455794c6eb0f1664b6179fe542c7c1d3010314a3e8a905ae4",
-    "macOS-X64": "4b9d8e4e89f16a7c1e7edc7893aa189b37d5b4412be724a86ef59c49d11a6f75",
+    "Linux-X64": "0ad002fb6ca4ed5e7947d30a804419c1d8de1de76a9dac6b7a2c333316f59da2",
+    "macOS-ARM64": "f14ff43a5d6ca136e93caf9ab3aeaa7facce399da063babe3f6e6520256b24e4",
+    "macOS-X64": "fbb22e5e7be0b2eef2d03647668150fece7537857ddc121422aab61685d9e114",
 }

 _swift_arch_map = {
--- a/swift/tools/tracing-config.lua
+++ b/swift/tools/tracing-config.lua
@@ -25,11 +25,30 @@ function RegisterExtractorPack(id)
      end
    end

+    -- removes unsupported -Xcc flag, e.g, calling strip_unsupported_xcc_arg('-foo', 2) against
+    -- swift -Xcc -foo -Xcc -bar main.swift
+    -- will only leave 'swift main.swift' removing both -Xcc -foo, and also -Xcc -bar
+    -- removes unsupported CLI arg passed to clang via -Xcc together with the following how_many args
+    function strip_unsupported_clang_arg(args, arg, how_many)
+        local index = indexOf(args, arg)
+        if index and index > 0 and args[index - 1] == '-Xcc' then
+            index = index - 1  -- start from -Xcc
+            how_many = 2 * (how_many + 1)  -- need to remove initial -Xcc <arg> as well as following -Xcc prefixed flags
+            while (how_many > 0)
+            do
+                table.remove(args, index)
+                how_many = how_many - 1
+            end
+        end
+    end
+
    function strip_unsupported_args(args)
      strip_unsupported_arg(args, '-emit-localized-strings', 0)
      strip_unsupported_arg(args, '-emit-localized-strings-path', 1)
      strip_unsupported_arg(args, '-stack-check', 0)
      strip_unsupported_arg(args, '-experimental-skip-non-inlinable-function-bodies-without-types', 0)
+      strip_unsupported_arg(args, '-enable-default-cmo', 0)
+      strip_unsupported_clang_arg(args, '-ivfsstatcache', 1)
    end

    -- xcodebuild does not always specify the -resource-dir in which case the compiler falls back
Author	SHA1	Message	Date
Alex Denisov	1e9f17489d	Merge branch 'alexdenisov/5.8-rebase' into alexdenisov/swift-5.8-resource-dir	2023-06-01 09:23:05 +02:00
Alex Denisov	dd14acac27	Merge branch 'main' into alexdenisov/5.8-rebase	2023-06-01 09:22:23 +02:00
Alex Denisov	7c1bfc00df	Swift: remove outdated db migration	2023-06-01 09:00:55 +02:00
Alex Denisov	2cf8f21f0e	Swift: trigger CI	2023-05-05 08:14:38 +02:00
Alex Denisov	16b011e04b	Swift: use prebuilt resource-dir	2023-05-05 08:12:45 +02:00
Alex Denisov	3a3ffa6379	Swift: ignore more CLI args	2023-05-05 08:12:41 +02:00
Paolo Tranquilli	4ce141ca10	Swift: add clang ignored flag	2023-04-27 15:10:56 +00:00
Paolo Tranquilli	564c257851	Swift: accept location change in `ConcreteFuncDecl_getParam.ql` test	2023-04-27 15:10:56 +00:00
Paolo Tranquilli	eeb79850f4	Swift: accept `MethodLookupExpr` test results	2023-04-27 15:10:55 +00:00
Paolo Tranquilli	4e97f11113	Swift: print only `toBeTested` errors in `Errors.ql` test	2023-04-27 15:10:55 +00:00
Paolo Tranquilli	53247254d6	Swift: add 5.8 update QL test	2023-04-27 15:10:55 +00:00
Paolo Tranquilli	2ebd4c6a8f	Swift: remove print unextracted from action	2023-04-27 15:10:55 +00:00
Paolo Tranquilli	34fd78b3ed	Swift: add upgrade/downgrade scripts	2023-04-27 15:10:55 +00:00
Paolo Tranquilli	a8a758485d	Swift: minimal 5.8 compatibility	2023-04-27 15:10:55 +00:00