Fix typo in test setting

Use sudo nice with more local testing servers, to avoid timeouts in macos-15
2026-05-20 22:27:18 +02:00 · 2025-04-04 15:02:51 +02:00 · 2025-04-04 14:24:57 +02:00
1082 changed files with 9558 additions and 94691 deletions
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-8.1.1
+8.0.0
--- a/2
+++ b/2
@@ -8,7 +8,6 @@
 /javascript/ @github/codeql-javascript
 /python/ @github/codeql-python
 /ruby/ @github/codeql-ruby
-/rust/ @github/codeql-rust
 /swift/ @github/codeql-swift
 /misc/codegen/ @github/codeql-swift
 /java/kotlin-extractor/ @github/codeql-kotlin
@@ -42,7 +41,6 @@ MODULE.bazel @github/codeql-ci-reviewers
 /.github/workflows/go-* @github/codeql-go
 /.github/workflows/ql-for-ql-* @github/codeql-ql-for-ql-reviewers
 /.github/workflows/ruby-* @github/codeql-ruby
-/.github/workflows/rust.yml @github/codeql-rust
 /.github/workflows/swift.yml @github/codeql-swift

 # Misc
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -154,15 +154,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

 [[package]]
 name = "bitflags"
-version = "2.9.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
+checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"

 [[package]]
 name = "borsh"
-version = "1.5.5"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5430e3be710b68d984d1391c854eb431a9d548640711faa54eecb1df93db91cc"
+checksum = "2506947f73ad44e344215ccd6403ac2ae18cd8e046e581a441bf8d199f257f03"
 dependencies = [
 "cfg_aliases",
 ]
@@ -224,9 +224,9 @@ dependencies = [

 [[package]]
 name = "cargo_metadata"
-version = "0.19.2"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba"
+checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
 dependencies = [
 "camino",
 "cargo-platform",
@@ -275,7 +275,7 @@ version = "0.100.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4f114996bda14c0213f014a4ef31a7867dcf5f539a3900477fc6b20138e7a17b"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "chalk-derive",
 ]

@@ -301,7 +301,7 @@ dependencies = [
 "chalk-derive",
 "chalk-ir",
 "ena",
- "indexmap 2.9.0",
+ "indexmap 2.7.0",
 "itertools 0.12.1",
 "petgraph",
 "rustc-hash 1.1.0",
@@ -325,9 +325,9 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "4.5.35"
+version = "4.5.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944"
+checksum = "6088f3ae8c3608d19260cd7445411865a485688711b78b5be70d78cd96136f83"
 dependencies = [
 "clap_builder",
 "clap_derive",
@@ -335,9 +335,9 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.5.35"
+version = "4.5.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9"
+checksum = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8"
 dependencies = [
 "anstream",
 "anstyle",
@@ -622,7 +622,7 @@ version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d248bdd43ce613d87415282f69b9bb99d947d290b10962dd6c56233312c2ad5"
 dependencies = [
- "log 0.4.27",
+ "log 0.4.25",
 ]

 [[package]]
@@ -691,9 +691,9 @@ checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"

 [[package]]
 name = "equivalent"
-version = "1.0.2"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"

 [[package]]
 name = "figment"
@@ -781,7 +781,7 @@ checksum = "cc6bd114ceda131d3b1d665eba35788690ad37f5916457286b32ab6fd3c438dd"
 dependencies = [
 "cfg-if",
 "libc",
- "log 0.4.27",
+ "log 0.4.25",
 "rustversion",
 "windows",
 ]
@@ -812,7 +812,7 @@ checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19"
 dependencies = [
 "aho-corasick",
 "bstr",
- "log 0.4.27",
+ "log 0.4.25",
 "regex-automata 0.4.9",
 "regex-syntax 0.8.5",
 ]
@@ -918,9 +918,9 @@ dependencies = [

 [[package]]
 name = "indexmap"
-version = "2.9.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
 dependencies = [
 "equivalent",
 "hashbrown 0.15.2",
@@ -939,7 +939,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "inotify-sys",
 "libc",
 ]
@@ -979,9 +979,9 @@ dependencies = [

 [[package]]
 name = "itoa"
-version = "1.0.15"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"

 [[package]]
 name = "jod-thread"
@@ -1033,9 +1033,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"

 [[package]]
 name = "libc"
-version = "0.2.171"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"

 [[package]]
 name = "libredox"
@@ -1043,7 +1043,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "libc",
 "redox_syscall",
 ]
@@ -1074,14 +1074,14 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
 dependencies = [
- "log 0.4.27",
+ "log 0.4.25",
 ]

 [[package]]
 name = "log"
-version = "0.4.27"
+version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"

 [[package]]
 name = "loom"
@@ -1096,6 +1096,12 @@ dependencies = [
 "tracing-subscriber",
 ]

+[[package]]
+name = "lz4_flex"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5"
+
 [[package]]
 name = "matchers"
 version = "0.1.0"
@@ -1136,7 +1142,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
 "libc",
- "log 0.4.27",
+ "log 0.4.25",
 "wasi 0.11.0+wasi-snapshot-preview1",
 "windows-sys 0.52.0",
 ]
@@ -1172,13 +1178,13 @@ version = "8.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "filetime",
 "fsevent-sys",
 "inotify",
 "kqueue",
 "libc",
- "log 0.4.27",
+ "log 0.4.25",
 "mio",
 "notify-types",
 "walkdir",
@@ -1234,9 +1240,9 @@ checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"

 [[package]]
 name = "oorandom"
-version = "11.1.5"
+version = "11.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
+checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9"

 [[package]]
 name = "os_str_bytes"
@@ -1325,7 +1331,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
 "fixedbitset",
- "indexmap 2.9.0",
+ "indexmap 2.7.0",
 ]

 [[package]]
@@ -1392,7 +1398,7 @@ version = "0.100.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1651b0f7e8c3eb7c27a88f39d277e69c32bfe58e3be174d286c1a24d6a7a4d8"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "ra-ap-rustc_hashes",
 "ra-ap-rustc_index",
 "tracing",
@@ -1464,16 +1470,18 @@ dependencies = [

 [[package]]
 name = "ra_ap_base_db"
-version = "0.0.273"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fd761118bbafe29e2b187e694c6b8e800f2c7822bbc1d9d2db4ac21fb8b0365"
+checksum = "4baa9734d254af14fd603528ad594650dea601b1764492bd39988da38598ae67"
 dependencies = [
 "dashmap 5.5.3",
 "la-arena",
+ "lz4_flex",
 "ra_ap_cfg",
 "ra_ap_intern",
 "ra_ap_query-group-macro",
 "ra_ap_span",
+ "ra_ap_stdx",
 "ra_ap_syntax",
 "ra_ap_vfs",
 "rustc-hash 2.1.1",
@@ -1485,9 +1493,9 @@ dependencies = [

 [[package]]
 name = "ra_ap_cfg"
-version = "0.0.273"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ce74ce1af24afd86d3529dbbf5a849d026948b2d8ba51d199b6ea6db6e345b6"
+checksum = "0ef2ba45636c5e585040c0c4bee640737a6001b08309f1a25ca78cf04abfbf90"
 dependencies = [
 "ra_ap_intern",
 "ra_ap_tt",
@@ -1497,20 +1505,20 @@ dependencies = [

 [[package]]
 name = "ra_ap_edition"
-version = "0.0.273"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f423b9fb19e3920e4c7039120d09d9c79070a26efe8ff9f787c7234b07f518c5"
+checksum = "8955c1484d5e7274f755187788ba0d51eb149f870c69cdf0d87c3b7edea20ea0"

 [[package]]
 name = "ra_ap_hir"
-version = "0.0.273"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd4aa8a568b80d288b90c4fa5dc8a3cc405914d261bfd33a3761c1ba41be358d"
+checksum = "a51d7955beff2212701b149bea36d4cf2dc0f5cd129652c9bcf0cb5c0b021078"
 dependencies = [
 "arrayvec",
 "either",
- "indexmap 2.9.0",
- "itertools 0.14.0",
+ "indexmap 2.7.0",
+ "itertools 0.12.1",
 "ra_ap_base_db",
 "ra_ap_cfg",
 "ra_ap_hir_def",
@@ -1529,20 +1537,23 @@ dependencies = [

 [[package]]
 name = "ra_ap_hir_def"
-version = "0.0.273"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acb18d9378a828a23ccf87b89199db005adb67ba2a05a37d7a3fcad4d1036e66"
+checksum = "e5c97e617e4c585d24b3d4f668861452aedddfbe0262f4c53235dcea77e62f9b"
 dependencies = [
 "arrayvec",
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "cov-mark",
+ "dashmap 5.5.3",
 "drop_bomb",
 "either",
 "fst",
- "indexmap 2.9.0",
- "itertools 0.14.0",
+ "hashbrown 0.14.5",
+ "indexmap 2.7.0",
+ "itertools 0.12.1",
 "la-arena",
 "ra-ap-rustc_abi",
+ "ra-ap-rustc_hashes",
 "ra-ap-rustc_parse_format",
 "ra_ap_base_db",
 "ra_ap_cfg",
@@ -1559,20 +1570,21 @@ dependencies = [
 "salsa",
 "smallvec",
 "text-size",
- "thin-vec",
 "tracing",
 "triomphe",
 ]

 [[package]]
 name = "ra_ap_hir_expand"
-version = "0.0.273"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "094fa79d8f661f52cf3b7fb8b3d91c4be2ad9e71a3967d3dacd25429fa44b37d"
+checksum = "be57c0d7e3f2180dd8ea584b11447f34060eadc06f0f6d559e2a790f6e91b6c5"
 dependencies = [
 "cov-mark",
 "either",
- "itertools 0.14.0",
+ "hashbrown 0.14.5",
+ "itertools 0.12.1",
+ "la-arena",
 "ra_ap_base_db",
 "ra_ap_cfg",
 "ra_ap_intern",
@@ -1593,22 +1605,24 @@ dependencies = [

 [[package]]
 name = "ra_ap_hir_ty"
-version = "0.0.273"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "093482d200d5db421db5692e7819bbb14fb717cc8cb0f91f93cce9fde85b3df2"
+checksum = "f260f35748f3035b46a8afcdebda7cb75d95c24750105fad86101d09a9d387c8"
 dependencies = [
 "arrayvec",
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "chalk-derive",
 "chalk-ir",
 "chalk-recursive",
 "chalk-solve",
 "cov-mark",
+ "dashmap 5.5.3",
 "either",
 "ena",
- "indexmap 2.9.0",
- "itertools 0.14.0",
+ "indexmap 2.7.0",
+ "itertools 0.12.1",
 "la-arena",
+ "nohash-hasher",
 "oorandom",
 "ra-ap-rustc_abi",
 "ra-ap-rustc_index",
@@ -1633,18 +1647,19 @@ dependencies = [

 [[package]]
 name = "ra_ap_ide_db"
-version = "0.0.273"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b655b92dfa9444db8129321b9217d9e4a83a58ee707aa1004a93052acfb43d57"
+checksum = "0426263be26e27cb55a3b9ef88b120511b66fe7d9b418a2473d6d5f3ac2fe0a6"
 dependencies = [
 "arrayvec",
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "cov-mark",
 "crossbeam-channel",
+ "dashmap 5.5.3",
 "either",
 "fst",
- "indexmap 2.9.0",
- "itertools 0.14.0",
+ "indexmap 2.7.0",
+ "itertools 0.12.1",
 "line-index",
 "memchr",
 "nohash-hasher",
@@ -1666,9 +1681,9 @@ dependencies = [

 [[package]]
 name = "ra_ap_intern"
-version = "0.0.273"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4e528496b4d4c351806bb073d3d7f6526535741b9e8801776603c924bbec624"
+checksum = "f6ea8c9615b3b0688cf557e7310dbd9432f43860c8ea766d54f4416cbecf3571"
 dependencies = [
 "dashmap 5.5.3",
 "hashbrown 0.14.5",
@@ -1678,16 +1693,17 @@ dependencies = [

 [[package]]
 name = "ra_ap_load-cargo"
-version = "0.0.273"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a97a5070b2f4b99f56683d91b2687aa0c530d8969cc5252ec2ae5644e428ffe"
+checksum = "570907e16725c13a678bfd8050ce8839af2831da042a0878b75ee8c41b0f7b0c"
 dependencies = [
 "anyhow",
 "crossbeam-channel",
- "itertools 0.14.0",
+ "itertools 0.12.1",
 "ra_ap_hir_expand",
 "ra_ap_ide_db",
 "ra_ap_intern",
+ "ra_ap_paths",
 "ra_ap_proc_macro_api",
 "ra_ap_project_model",
 "ra_ap_span",
@@ -1699,9 +1715,9 @@ dependencies = [

 [[package]]
 name = "ra_ap_mbe"
-version = "0.0.273"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b187ee5ee3fa726eeea5142242a0397e2200d77084026986a68324b9599f9046"
+checksum = "e893fe03b04b30c9b5a339ac2bf39ce32ac9c05a8b50121b7d89ce658346e164"
 dependencies = [
 "arrayvec",
 "cov-mark",
@@ -1710,17 +1726,19 @@ dependencies = [
 "ra_ap_parser",
 "ra_ap_span",
 "ra_ap_stdx",
+ "ra_ap_syntax",
 "ra_ap_syntax-bridge",
 "ra_ap_tt",
 "rustc-hash 2.1.1",
 "smallvec",
+ "tracing",
 ]

 [[package]]
 name = "ra_ap_parser"
-version = "0.0.273"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2306e6c051e60483f3b317fac9dec6c883b7792eeb8db24ec6f39dbfa5430159"
+checksum = "6fd9a264120968b14a66b6ba756cd7f99435385b5dbc2f0a611cf3a12221c385"
 dependencies = [
 "drop_bomb",
 "ra-ap-rustc_lexer",
@@ -1730,20 +1748,20 @@ dependencies = [

 [[package]]
 name = "ra_ap_paths"
-version = "0.0.273"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcedd00499621bdd0f1fe01955c04e4b388197aa826744003afaf6cc2944bc80"
+checksum = "f47817351651e36b56ff3afc483b41600053c9cb7e67d945467c0abe93416032"
 dependencies = [
 "camino",
 ]

 [[package]]
 name = "ra_ap_proc_macro_api"
-version = "0.0.273"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2e49b550015cd4ad152bd78d92d73594497f2e44f61273f9fed3534ad4bbbe"
+checksum = "d96da3b8b9f6b813a98f5357eef303905450741f47ba90adaab8a5371b748416"
 dependencies = [
- "indexmap 2.9.0",
+ "indexmap 2.7.0",
 "ra_ap_intern",
 "ra_ap_paths",
 "ra_ap_span",
@@ -1758,9 +1776,9 @@ dependencies = [

 [[package]]
 name = "ra_ap_profile"
-version = "0.0.273"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cdbd27ebe02ec21fdae3df303f194bda036a019ecef80d47e0082646f06c54"
+checksum = "13637377287c84f88a628e40229d271ef0081c0d683956bd99a6c8278a4f8b14"
 dependencies = [
 "cfg-if",
 "libc",
@@ -1770,13 +1788,13 @@ dependencies = [

 [[package]]
 name = "ra_ap_project_model"
-version = "0.0.273"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eaa3406c891a7840d20ce615f8decca32cbc9d3654b82dcbcc3a31257ce90b9"
+checksum = "053c5207a638fc7a752c7a454bc952b28b0d02f0bf9f6d7ec785ec809579d8fa"
 dependencies = [
 "anyhow",
 "cargo_metadata",
- "itertools 0.14.0",
+ "itertools 0.12.1",
 "la-arena",
 "ra_ap_base_db",
 "ra_ap_cfg",
@@ -1796,20 +1814,22 @@ dependencies = [

 [[package]]
 name = "ra_ap_query-group-macro"
-version = "0.0.273"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fbc1748e4876a9b0ccfacfc7e2fe254f30e92ef58d98925282b3803e8b004ed"
+checksum = "0f1a38f07b442e47a234cbe2e8fd1b8a41ff0cc5123cb1cf994c5ce20edb5bd6"
 dependencies = [
+ "heck",
 "proc-macro2",
 "quote",
+ "salsa",
 "syn",
 ]

 [[package]]
 name = "ra_ap_span"
-version = "0.0.273"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed1d036e738bf32a057d90698df85bcb83ed6263b5fe9fba132c99e8ec3aecaf"
+checksum = "8818680c6f7da3b32cb2bb0992940b24264b1aa90203aa94812e09ab34d362d1"
 dependencies = [
 "hashbrown 0.14.5",
 "la-arena",
@@ -1823,12 +1843,12 @@ dependencies = [

 [[package]]
 name = "ra_ap_stdx"
-version = "0.0.273"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e3775954ab24408f71e97079a97558078a166a4082052e83256ae4c22dae18d"
+checksum = "f1c10bee1b03fc48083862c13cf06bd3ed17760463ecce2734103a2f511e5ed4"
 dependencies = [
 "crossbeam-channel",
- "itertools 0.14.0",
+ "itertools 0.12.1",
 "jod-thread",
 "libc",
 "miow",
@@ -1838,12 +1858,14 @@ dependencies = [

 [[package]]
 name = "ra_ap_syntax"
-version = "0.0.273"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b49b081f209a764700f688db91820a66c2ecfe5f138895d831361cf84f716691"
+checksum = "92bc32f3946fc5fcbdc79e61b7e26a8c2a3a56f3ef6ab27c7d298a9e21a462f2"
 dependencies = [
+ "cov-mark",
 "either",
- "itertools 0.14.0",
+ "indexmap 2.7.0",
+ "itertools 0.12.1",
 "ra-ap-rustc_lexer",
 "ra_ap_parser",
 "ra_ap_stdx",
@@ -1856,9 +1878,9 @@ dependencies = [

 [[package]]
 name = "ra_ap_syntax-bridge"
-version = "0.0.273"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2740bbe603d527f2cf0aaf51629de7d072694fbbaaeda8264f7591be1493d1b"
+checksum = "a42052c44c98c122c37aac476260c8f19d8fec495edc9c05835307c9ae86194d"
 dependencies = [
 "ra_ap_intern",
 "ra_ap_parser",
@@ -1867,13 +1889,14 @@ dependencies = [
 "ra_ap_syntax",
 "ra_ap_tt",
 "rustc-hash 2.1.1",
+ "tracing",
 ]

 [[package]]
 name = "ra_ap_toolchain"
-version = "0.0.273"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efbff9f26f307ef958586357d1653d000861dcd3acbaf33a009651e024720c7e"
+checksum = "75996e70b3a0c68cd5157ba01f018964c7c6a5d7b209047d449b393139d0b57f"
 dependencies = [
 "camino",
 "home",
@@ -1881,9 +1904,9 @@ dependencies = [

 [[package]]
 name = "ra_ap_tt"
-version = "0.0.273"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b1ce3ac14765e414fa6031fda7dc35d3492c74de225aac689ba8b8bf037e1f8"
+checksum = "0e4ee31e93bfabe83e6720b7469db88d7ad7ec5c59a1f011efec4aa1327ffc5c"
 dependencies = [
 "arrayvec",
 "ra-ap-rustc_lexer",
@@ -1894,13 +1917,13 @@ dependencies = [

 [[package]]
 name = "ra_ap_vfs"
-version = "0.0.273"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29427a7c27ce8ddfefb52d77c952a4588c74d0a7ab064dc627129088a90423ca"
+checksum = "f6aac1e277ac70bb073f40f8a3fc44e4b1bb9e4d4b1d0e0bd2f8269543560f80"
 dependencies = [
 "crossbeam-channel",
 "fst",
- "indexmap 2.9.0",
+ "indexmap 2.7.0",
 "nohash-hasher",
 "ra_ap_paths",
 "ra_ap_stdx",
@@ -1910,9 +1933,9 @@ dependencies = [

 [[package]]
 name = "ra_ap_vfs-notify"
-version = "0.0.273"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5a0e3095b8216ecc131f38b4b0025cac324a646469a95d2670354aee7278078"
+checksum = "cd95285146049621ee8f7a512c982a008bf036321fcc9b01a95c1ad7e6aeae57"
 dependencies = [
 "crossbeam-channel",
 "notify",
@@ -1982,7 +2005,7 @@ version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 ]

 [[package]]
@@ -2070,10 +2093,10 @@ checksum = "2febf9acc5ee5e99d1ad0afcdbccc02d87aa3f857a1f01f825b80eacf8edfcd1"

 [[package]]
 name = "rustc_apfloat"
-version = "0.2.2+llvm-462a31f5a5ab"
-source = "git+https://github.com/redsun82/rustc_apfloat.git?rev=32968f16ef1b082243f9bf43a3fbd65c381b3e27#32968f16ef1b082243f9bf43a3fbd65c381b3e27"
+version = "0.2.1+llvm-462a31f5a5ab"
+source = "git+https://github.com/redsun82/rustc_apfloat.git?rev=096d585100636bc2e9f09d7eefec38c5b334d47b#096d585100636bc2e9f09d7eefec38c5b334d47b"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 1.3.2",
 "smallvec",
 ]

@@ -2100,7 +2123,7 @@ dependencies = [
 "dashmap 6.1.0",
 "hashbrown 0.15.2",
 "hashlink",
- "indexmap 2.9.0",
+ "indexmap 2.7.0",
 "parking_lot",
 "portable-atomic",
 "rayon",
@@ -2153,9 +2176,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"

 [[package]]
 name = "semver"
-version = "1.0.26"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
+checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba"
 dependencies = [
 "serde",
 ]
@@ -2211,7 +2234,7 @@ dependencies = [
 "chrono",
 "hex",
 "indexmap 1.9.3",
- "indexmap 2.9.0",
+ "indexmap 2.7.0",
 "serde",
 "serde_derive",
 "serde_json",
@@ -2237,7 +2260,7 @@ version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.9.0",
+ "indexmap 2.7.0",
 "itoa",
 "ryu",
 "serde",
@@ -2321,26 +2344,20 @@ version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233"

-[[package]]
-name = "thin-vec"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "144f754d318415ac792f9d69fc87abbbfc043ce2ef041c60f16ad828f638717d"
-
 [[package]]
 name = "thiserror"
-version = "2.0.12"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "2.0.12"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2415,7 +2432,7 @@ version = "0.22.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
 dependencies = [
- "indexmap 2.9.0",
+ "indexmap 2.7.0",
 "serde",
 "serde_spanned",
 "toml_datetime",
@@ -2471,7 +2488,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
 dependencies = [
- "log 0.4.27",
+ "log 0.4.25",
 "once_cell",
 "tracing-core",
 ]
@@ -2586,9 +2603,9 @@ checksum = "a3e5df347f0bf3ec1d670aad6ca5c6a1859cd9ea61d2113125794654ccced68f"

 [[package]]
 name = "unicode-ident"
-version = "1.0.17"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe"
+checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"

 [[package]]
 name = "unicode-properties"
@@ -2669,7 +2686,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
 dependencies = [
 "bumpalo",
- "log 0.4.27",
+ "log 0.4.25",
 "proc-macro2",
 "quote",
 "syn",
@@ -2978,7 +2995,7 @@ version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 ]

 [[package]]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,4 +14,4 @@ members = [
 [patch.crates-io]
 # patch for build script bug preventing bazel build
 # see https://github.com/rust-lang/rustc_apfloat/pull/17
-rustc_apfloat = { git = "https://github.com/redsun82/rustc_apfloat.git", rev = "32968f16ef1b082243f9bf43a3fbd65c381b3e27" }
+rustc_apfloat = { git = "https://github.com/redsun82/rustc_apfloat.git", rev = "096d585100636bc2e9f09d7eefec38c5b334d47b" }
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -75,7 +75,7 @@ use_repo(
    "vendor_ts__argfile-0.2.1",
    "vendor_ts__chalk-ir-0.100.0",
    "vendor_ts__chrono-0.4.40",
-    "vendor_ts__clap-4.5.35",
+    "vendor_ts__clap-4.5.32",
    "vendor_ts__dunce-1.0.5",
    "vendor_ts__either-1.15.0",
    "vendor_ts__encoding-0.2.33",
@@ -90,22 +90,22 @@ use_repo(
    "vendor_ts__num_cpus-1.16.0",
    "vendor_ts__proc-macro2-1.0.94",
    "vendor_ts__quote-1.0.40",
-    "vendor_ts__ra_ap_base_db-0.0.273",
-    "vendor_ts__ra_ap_cfg-0.0.273",
-    "vendor_ts__ra_ap_hir-0.0.273",
-    "vendor_ts__ra_ap_hir_def-0.0.273",
-    "vendor_ts__ra_ap_hir_expand-0.0.273",
-    "vendor_ts__ra_ap_hir_ty-0.0.273",
-    "vendor_ts__ra_ap_ide_db-0.0.273",
-    "vendor_ts__ra_ap_intern-0.0.273",
-    "vendor_ts__ra_ap_load-cargo-0.0.273",
-    "vendor_ts__ra_ap_parser-0.0.273",
-    "vendor_ts__ra_ap_paths-0.0.273",
-    "vendor_ts__ra_ap_project_model-0.0.273",
-    "vendor_ts__ra_ap_span-0.0.273",
-    "vendor_ts__ra_ap_stdx-0.0.273",
-    "vendor_ts__ra_ap_syntax-0.0.273",
-    "vendor_ts__ra_ap_vfs-0.0.273",
+    "vendor_ts__ra_ap_base_db-0.0.270",
+    "vendor_ts__ra_ap_cfg-0.0.270",
+    "vendor_ts__ra_ap_hir-0.0.270",
+    "vendor_ts__ra_ap_hir_def-0.0.270",
+    "vendor_ts__ra_ap_hir_expand-0.0.270",
+    "vendor_ts__ra_ap_hir_ty-0.0.270",
+    "vendor_ts__ra_ap_ide_db-0.0.270",
+    "vendor_ts__ra_ap_intern-0.0.270",
+    "vendor_ts__ra_ap_load-cargo-0.0.270",
+    "vendor_ts__ra_ap_parser-0.0.270",
+    "vendor_ts__ra_ap_paths-0.0.270",
+    "vendor_ts__ra_ap_project_model-0.0.270",
+    "vendor_ts__ra_ap_span-0.0.270",
+    "vendor_ts__ra_ap_stdx-0.0.270",
+    "vendor_ts__ra_ap_syntax-0.0.270",
+    "vendor_ts__ra_ap_vfs-0.0.270",
    "vendor_ts__rand-0.9.0",
    "vendor_ts__rayon-1.10.0",
    "vendor_ts__regex-1.11.1",
--- a/actions/extractor/tools/autobuild-impl.ps1
+++ b/actions/extractor/tools/autobuild-impl.ps1
@@ -1,34 +1,27 @@
-# Note: We're adding the `reusable_workflows` subdirectories to proactively
-# record workflows that were called cross-repo, check them out locally,
-# and enable an interprocedural analysis across the workflow files.
-# These workflows follow the convention `.github/reusable_workflows/<nwo>/*.ya?ml`
-$DefaultPathFilters = @(
-    'exclude:**/*',
-    'include:.github/workflows/*.yml',
-    'include:.github/workflows/*.yaml',
-    'include:.github/reusable_workflows/**/*.yml',
-    'include:.github/reusable_workflows/**/*.yaml',
-    'include:**/action.yml',
-    'include:**/action.yaml'
-)
-
-if ($null -ne $env:LGTM_INDEX_FILTERS) {
-    Write-Output 'LGTM_INDEX_FILTERS set. Using the default filters together with the user-provided filters, and passing through to the JavaScript extractor.'
-    # Begin with the default path inclusions only,
-    # followed by the user-provided filters.
-    # If the user provided `paths`, those patterns override the default inclusions
-    # (because `LGTM_INDEX_FILTERS` will begin with `exclude:**/*`).
-    # If the user provided `paths-ignore`, those patterns are excluded.
-    $PathFilters = ($DefaultPathFilters -join "`n") + "`n" + $env:LGTM_INDEX_FILTERS
-    $env:LGTM_INDEX_FILTERS = $PathFilters
+if (($null -ne $env:LGTM_INDEX_INCLUDE) -or ($null -ne $env:LGTM_INDEX_EXCLUDE) -or ($null -ne $env:LGTM_INDEX_FILTERS)) {
+    Write-Output 'Path filters set. Passing them through to the JavaScript extractor.' 
 } else {
-    Write-Output 'LGTM_INDEX_FILTERS not set. Using the default filters, and passing through to the JavaScript extractor.'
+    Write-Output 'No path filters set. Using the default filters.'
+    # Note: We're adding the `reusable_workflows` subdirectories to proactively
+    # record workflows that were called cross-repo, check them out locally,
+    # and enable an interprocedural analysis across the workflow files.
+    # These workflows follow the convention `.github/reusable_workflows/<nwo>/*.ya?ml`
+    $DefaultPathFilters = @(
+        'exclude:**/*',
+        'include:.github/workflows/*.yml',
+        'include:.github/workflows/*.yaml',
+        'include:.github/reusable_workflows/**/*.yml',
+        'include:.github/reusable_workflows/**/*.yaml',
+        'include:**/action.yml',
+        'include:**/action.yaml'
+    )
+
    $env:LGTM_INDEX_FILTERS = $DefaultPathFilters -join "`n"
 }

 # Find the JavaScript extractor directory via `codeql resolve extractor`.
 $CodeQL = Join-Path $env:CODEQL_DIST 'codeql.exe'
-$env:CODEQL_EXTRACTOR_JAVASCRIPT_ROOT = &"$CodeQL" resolve extractor --language javascript
+$env:CODEQL_EXTRACTOR_JAVASCRIPT_ROOT = &$CodeQL resolve extractor --language javascript
 if ($LASTEXITCODE -ne 0) {
    throw 'Failed to resolve JavaScript extractor.'
 }
@@ -47,7 +40,7 @@ $env:CODEQL_EXTRACTOR_JAVASCRIPT_SOURCE_ARCHIVE_DIR = $env:CODEQL_EXTRACTOR_ACTI
 $env:CODEQL_EXTRACTOR_JAVASCRIPT_TRAP_DIR = $env:CODEQL_EXTRACTOR_ACTIONS_TRAP_DIR
 $env:CODEQL_EXTRACTOR_JAVASCRIPT_WIP_DATABASE = $env:CODEQL_EXTRACTOR_ACTIONS_WIP_DATABASE

-&"$JavaScriptAutoBuild"
+&$JavaScriptAutoBuild
 if ($LASTEXITCODE -ne 0) {
    throw "JavaScript autobuilder failed."
 }
--- a/actions/extractor/tools/autobuild.cmd
+++ b/actions/extractor/tools/autobuild.cmd
@@ -1,4 +1,3 @@
@echo off
 rem All of the work is done in the PowerShell script
-echo "Running PowerShell script at '%~dp0autobuild-impl.ps1'"
-powershell.exe -File "%~dp0autobuild-impl.ps1"
+powershell.exe %~dp0autobuild-impl.ps1
--- a/actions/extractor/tools/autobuild.sh
+++ b/actions/extractor/tools/autobuild.sh
@@ -17,28 +17,16 @@ include:**/action.yaml
 END
 )

-if [ -n "${LGTM_INDEX_FILTERS:-}" ]; then
-    echo "LGTM_INDEX_FILTERS set. Using the default filters together with the user-provided filters, and passing through to the JavaScript extractor."
-    # Begin with the default path inclusions only,
-    # followed by the user-provided filters.
-    # If the user provided `paths`, those patterns override the default inclusions
-    # (because `LGTM_INDEX_FILTERS` will begin with `exclude:**/*`).
-    # If the user provided `paths-ignore`, those patterns are excluded.
-    PATH_FILTERS="$(cat << END
-${DEFAULT_PATH_FILTERS}
-${LGTM_INDEX_FILTERS}
-END
-)"
-    LGTM_INDEX_FILTERS="${PATH_FILTERS}"
-    export LGTM_INDEX_FILTERS
+if [ -n "${LGTM_INDEX_INCLUDE:-}" ] || [ -n "${LGTM_INDEX_EXCLUDE:-}" ] || [ -n "${LGTM_INDEX_FILTERS:-}" ] ; then
+    echo "Path filters set. Passing them through to the JavaScript extractor."
 else
-    echo "LGTM_INDEX_FILTERS not set. Using the default filters, and passing through to the JavaScript extractor."
+    echo "No path filters set. Using the default filters."
    LGTM_INDEX_FILTERS="${DEFAULT_PATH_FILTERS}"
    export LGTM_INDEX_FILTERS
 fi

 # Find the JavaScript extractor directory via `codeql resolve extractor`.
-CODEQL_EXTRACTOR_JAVASCRIPT_ROOT="$("${CODEQL_DIST}/codeql" resolve extractor --language javascript)"
+CODEQL_EXTRACTOR_JAVASCRIPT_ROOT="$($CODEQL_DIST/codeql resolve extractor --language javascript)"
 export CODEQL_EXTRACTOR_JAVASCRIPT_ROOT

 echo "Found JavaScript extractor at '${CODEQL_EXTRACTOR_JAVASCRIPT_ROOT}'."
@@ -54,4 +42,4 @@ env CODEQL_EXTRACTOR_JAVASCRIPT_DIAGNOSTIC_DIR="${CODEQL_EXTRACTOR_ACTIONS_DIAGN
    CODEQL_EXTRACTOR_JAVASCRIPT_SOURCE_ARCHIVE_DIR="${CODEQL_EXTRACTOR_ACTIONS_SOURCE_ARCHIVE_DIR}" \
    CODEQL_EXTRACTOR_JAVASCRIPT_TRAP_DIR="${CODEQL_EXTRACTOR_ACTIONS_TRAP_DIR}" \
    CODEQL_EXTRACTOR_JAVASCRIPT_WIP_DATABASE="${CODEQL_EXTRACTOR_ACTIONS_WIP_DATABASE}" \
-    "${JAVASCRIPT_AUTO_BUILD}"
+    ${JAVASCRIPT_AUTO_BUILD}
--- a/actions/ql/integration-tests/filters-default/actions.ql
+++ b/actions/ql/integration-tests/filters-default/actions.ql
@@ -1,5 +0,0 @@
-import actions
-
-from AstNode n
-where n instanceof Workflow or n instanceof CompositeAction
-select n
--- a/actions/ql/integration-tests/filters/actions.default-filters.expected
+++ b/actions/ql/integration-tests/filters/actions.default-filters.expected
@@ -1,6 +0,0 @@
-| src/.github/action.yaml:1:1:11:32 | name: ' ... action' |
-| src/.github/actions/action-name/action.yml:1:1:11:32 | name: ' ... action' |
-| src/.github/workflows/workflow.yml:1:1:12:33 | name: A workflow |
-| src/action.yml:1:1:11:32 | name: ' ... action' |
-| src/excluded/action.yml:1:1:11:32 | name: ' ... action' |
-| src/included/action.yml:1:1:11:32 | name: ' ... action' |
--- a/actions/ql/integration-tests/filters/actions.paths-and-paths-ignore.expected
+++ b/actions/ql/integration-tests/filters/actions.paths-and-paths-ignore.expected
@@ -1,2 +0,0 @@
-| src/included/action.yml:1:1:11:32 | name: ' ... action' |
-| src/included/unreachable-workflow.yml:1:1:12:33 | name: A ... orkflow |
--- a/actions/ql/integration-tests/filters/actions.paths-ignore-only.expected
+++ b/actions/ql/integration-tests/filters/actions.paths-ignore-only.expected
@@ -1,5 +0,0 @@
-| src/.github/action.yaml:1:1:11:32 | name: ' ... action' |
-| src/.github/actions/action-name/action.yml:1:1:11:32 | name: ' ... action' |
-| src/.github/workflows/workflow.yml:1:1:12:33 | name: A workflow |
-| src/action.yml:1:1:11:32 | name: ' ... action' |
-| src/included/action.yml:1:1:11:32 | name: ' ... action' |
--- a/actions/ql/integration-tests/filters/actions.paths-only.expected
+++ b/actions/ql/integration-tests/filters/actions.paths-only.expected
@@ -1,2 +0,0 @@
-| src/included/action.yml:1:1:11:32 | name: ' ... action' |
-| src/included/unreachable-workflow.yml:1:1:12:33 | name: A ... orkflow |
--- a/actions/ql/integration-tests/filters/actions.ql
+++ b/actions/ql/integration-tests/filters/actions.ql
@@ -1,5 +0,0 @@
-import actions
-
-from AstNode n
-where n instanceof Workflow or n instanceof CompositeAction
-select n
--- a/actions/ql/integration-tests/filters/codeql-config.paths-and-paths-ignore.yml
+++ b/actions/ql/integration-tests/filters/codeql-config.paths-and-paths-ignore.yml
@@ -1,4 +0,0 @@
-paths:
-  - 'included'
-paths-ignore:
-  - 'excluded'
--- a/actions/ql/integration-tests/filters/codeql-config.paths-ignore-only.yml
+++ b/actions/ql/integration-tests/filters/codeql-config.paths-ignore-only.yml
@@ -1,2 +0,0 @@
-paths-ignore:
-  - 'excluded'
--- a/actions/ql/integration-tests/filters/codeql-config.paths-only.yml
+++ b/actions/ql/integration-tests/filters/codeql-config.paths-only.yml
@@ -1,2 +0,0 @@
-paths:
-  - 'included'
--- a/actions/ql/integration-tests/filters/source_archive.default-filters.expected
+++ b/actions/ql/integration-tests/filters/source_archive.default-filters.expected
@@ -1,6 +0,0 @@
-src/.github/action.yaml
-src/.github/actions/action-name/action.yml
-src/.github/workflows/workflow.yml
-src/action.yml
-src/excluded/action.yml
-src/included/action.yml
--- a/actions/ql/integration-tests/filters/source_archive.paths-and-paths-ignore.expected
+++ b/actions/ql/integration-tests/filters/source_archive.paths-and-paths-ignore.expected
@@ -1,3 +0,0 @@
-src/included/action.yml
-src/included/not-an-action.yml
-src/included/unreachable-workflow.yml
--- a/actions/ql/integration-tests/filters/source_archive.paths-ignore-only.expected
+++ b/actions/ql/integration-tests/filters/source_archive.paths-ignore-only.expected
@@ -1,5 +0,0 @@
-src/.github/action.yaml
-src/.github/actions/action-name/action.yml
-src/.github/workflows/workflow.yml
-src/action.yml
-src/included/action.yml
--- a/actions/ql/integration-tests/filters/source_archive.paths-only.expected
+++ b/actions/ql/integration-tests/filters/source_archive.paths-only.expected
@@ -1,3 +0,0 @@
-src/included/action.yml
-src/included/not-an-action.yml
-src/included/unreachable-workflow.yml
--- a/actions/ql/integration-tests/filters/src/.github/action.yaml
+++ b/actions/ql/integration-tests/filters/src/.github/action.yaml
@@ -1,11 +0,0 @@
-name: 'A composite action'
-description: 'Do something'
-runs:
-  using: "composite"
-  steps:
-    - name: Print
-      run: echo "Hello world"
-      shell: bash
-
-    - name: Checkout
-      uses: actions/checkout@v4
--- a/actions/ql/integration-tests/filters/src/.github/actions/action-name/action.yml
+++ b/actions/ql/integration-tests/filters/src/.github/actions/action-name/action.yml
@@ -1,11 +0,0 @@
-name: 'A composite action'
-description: 'Do something'
-runs:
-  using: "composite"
-  steps:
-    - name: Print
-      run: echo "Hello world"
-      shell: bash
-
-    - name: Checkout
-      uses: actions/checkout@v4
--- a/actions/ql/integration-tests/filters/src/.github/unreachable-workflow.yml
+++ b/actions/ql/integration-tests/filters/src/.github/unreachable-workflow.yml
@@ -1,12 +0,0 @@
-name: An unreachable workflow
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  job:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
--- a/actions/ql/integration-tests/filters/src/.github/workflows/workflow.yml
+++ b/actions/ql/integration-tests/filters/src/.github/workflows/workflow.yml
@@ -1,12 +0,0 @@
-name: A workflow
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  job:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
--- a/actions/ql/integration-tests/filters/src/action.yml
+++ b/actions/ql/integration-tests/filters/src/action.yml
@@ -1,11 +0,0 @@
-name: 'A composite action'
-description: 'Do something'
-runs:
-  using: "composite"
-  steps:
-    - name: Print
-      run: echo "Hello world"
-      shell: bash
-
-    - name: Checkout
-      uses: actions/checkout@v4
--- a/actions/ql/integration-tests/filters/src/excluded/action.yml
+++ b/actions/ql/integration-tests/filters/src/excluded/action.yml
@@ -1,11 +0,0 @@
-name: 'A composite action'
-description: 'Do something'
-runs:
-  using: "composite"
-  steps:
-    - name: Print
-      run: echo "Hello world"
-      shell: bash
-
-    - name: Checkout
-      uses: actions/checkout@v4
--- a/actions/ql/integration-tests/filters/src/excluded/unreachable-workflow.yml
+++ b/actions/ql/integration-tests/filters/src/excluded/unreachable-workflow.yml
@@ -1,12 +0,0 @@
-name: An unreachable workflow
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  job:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
--- a/actions/ql/integration-tests/filters/src/included/action.yml
+++ b/actions/ql/integration-tests/filters/src/included/action.yml
@@ -1,11 +0,0 @@
-name: 'A composite action'
-description: 'Do something'
-runs:
-  using: "composite"
-  steps:
-    - name: Print
-      run: echo "Hello world"
-      shell: bash
-
-    - name: Checkout
-      uses: actions/checkout@v4
--- a/actions/ql/integration-tests/filters/src/included/not-an-action.yml
+++ b/actions/ql/integration-tests/filters/src/included/not-an-action.yml
@@ -1 +0,0 @@
-name: 'Not an action, just a YAML file'
--- a/actions/ql/integration-tests/filters/src/included/unreachable-workflow.yml
+++ b/actions/ql/integration-tests/filters/src/included/unreachable-workflow.yml
@@ -1,12 +0,0 @@
-name: An unreachable workflow
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  job:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
--- a/actions/ql/integration-tests/filters/src/unreachable-workflow.yml
+++ b/actions/ql/integration-tests/filters/src/unreachable-workflow.yml
@@ -1,12 +0,0 @@
-name: An unreachable workflow
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  job:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
--- a/actions/ql/integration-tests/filters/test.py
+++ b/actions/ql/integration-tests/filters/test.py
@@ -1,18 +0,0 @@
-import pytest
-
-@pytest.mark.ql_test(expected=".default-filters.expected")
-def test_default_filters(codeql, actions, check_source_archive):
-    check_source_archive.expected_suffix = ".default-filters.expected"
-    codeql.database.create(source_root="src")
-
-@pytest.mark.ql_test(expected=".paths-only.expected")
-def test_config_paths_only(codeql, actions):
-    codeql.database.create(source_root="src", codescanning_config="codeql-config.paths-only.yml")
-
-@pytest.mark.ql_test(expected=".paths-ignore-only.expected")
-def test_config_paths_ignore_only(codeql, actions):
-    codeql.database.create(source_root="src", codescanning_config="codeql-config.paths-ignore-only.yml")
-
-@pytest.mark.ql_test(expected=".paths-and-paths-ignore.expected")
-def test_config_paths_and_paths_ignore(codeql, actions):
-    codeql.database.create(source_root="src", codescanning_config="codeql-config.paths-and-paths-ignore.yml")
--- a/actions/ql/integration-tests/query-suite/actions-code-quality.qls.expected
+++ b/actions/ql/integration-tests/query-suite/actions-code-quality.qls.expected
@@ -1 +0,0 @@
-
--- a/actions/ql/integration-tests/query-suite/actions-code-scanning.qls.expected
+++ b/actions/ql/integration-tests/query-suite/actions-code-scanning.qls.expected
@@ -1,17 +0,0 @@
-ql/actions/ql/src/Security/CWE-077/EnvPathInjectionCritical.ql
-ql/actions/ql/src/Security/CWE-077/EnvVarInjectionCritical.ql
-ql/actions/ql/src/Security/CWE-094/CodeInjectionCritical.ql
-ql/actions/ql/src/Security/CWE-1395/UseOfKnownVulnerableAction.ql
-ql/actions/ql/src/Security/CWE-275/MissingActionsPermissions.ql
-ql/actions/ql/src/Security/CWE-285/ImproperAccessControl.ql
-ql/actions/ql/src/Security/CWE-312/ExcessiveSecretsExposure.ql
-ql/actions/ql/src/Security/CWE-312/SecretsInArtifacts.ql
-ql/actions/ql/src/Security/CWE-312/UnmaskedSecretExposure.ql
-ql/actions/ql/src/Security/CWE-349/CachePoisoningViaCodeInjection.ql
-ql/actions/ql/src/Security/CWE-349/CachePoisoningViaDirectCache.ql
-ql/actions/ql/src/Security/CWE-349/CachePoisoningViaPoisonableStep.ql
-ql/actions/ql/src/Security/CWE-367/UntrustedCheckoutTOCTOUCritical.ql
-ql/actions/ql/src/Security/CWE-367/UntrustedCheckoutTOCTOUHigh.ql
-ql/actions/ql/src/Security/CWE-829/ArtifactPoisoningCritical.ql
-ql/actions/ql/src/Security/CWE-829/UntrustedCheckoutCritical.ql
-ql/actions/ql/src/Security/CWE-829/UntrustedCheckoutHigh.ql
--- a/actions/ql/integration-tests/query-suite/actions-security-and-quality.qls.expected
+++ b/actions/ql/integration-tests/query-suite/actions-security-and-quality.qls.expected
@@ -1,27 +0,0 @@
-ql/actions/ql/src/Debug/SyntaxError.ql
-ql/actions/ql/src/Security/CWE-077/EnvPathInjectionCritical.ql
-ql/actions/ql/src/Security/CWE-077/EnvPathInjectionMedium.ql
-ql/actions/ql/src/Security/CWE-077/EnvVarInjectionCritical.ql
-ql/actions/ql/src/Security/CWE-077/EnvVarInjectionMedium.ql
-ql/actions/ql/src/Security/CWE-094/CodeInjectionCritical.ql
-ql/actions/ql/src/Security/CWE-094/CodeInjectionMedium.ql
-ql/actions/ql/src/Security/CWE-1395/UseOfKnownVulnerableAction.ql
-ql/actions/ql/src/Security/CWE-275/MissingActionsPermissions.ql
-ql/actions/ql/src/Security/CWE-285/ImproperAccessControl.ql
-ql/actions/ql/src/Security/CWE-312/ExcessiveSecretsExposure.ql
-ql/actions/ql/src/Security/CWE-312/SecretsInArtifacts.ql
-ql/actions/ql/src/Security/CWE-312/UnmaskedSecretExposure.ql
-ql/actions/ql/src/Security/CWE-349/CachePoisoningViaCodeInjection.ql
-ql/actions/ql/src/Security/CWE-349/CachePoisoningViaDirectCache.ql
-ql/actions/ql/src/Security/CWE-349/CachePoisoningViaPoisonableStep.ql
-ql/actions/ql/src/Security/CWE-367/UntrustedCheckoutTOCTOUCritical.ql
-ql/actions/ql/src/Security/CWE-367/UntrustedCheckoutTOCTOUHigh.ql
-ql/actions/ql/src/Security/CWE-571/ExpressionIsAlwaysTrueCritical.ql
-ql/actions/ql/src/Security/CWE-571/ExpressionIsAlwaysTrueHigh.ql
-ql/actions/ql/src/Security/CWE-829/ArtifactPoisoningCritical.ql
-ql/actions/ql/src/Security/CWE-829/ArtifactPoisoningMedium.ql
-ql/actions/ql/src/Security/CWE-829/UnpinnedActionsTag.ql
-ql/actions/ql/src/Security/CWE-829/UntrustedCheckoutCritical.ql
-ql/actions/ql/src/Security/CWE-829/UntrustedCheckoutHigh.ql
-ql/actions/ql/src/Security/CWE-829/UntrustedCheckoutMedium.ql
-ql/actions/ql/src/Violations Of Best Practice/CodeQL/UnnecessaryUseOfAdvancedConfig.ql
--- a/actions/ql/integration-tests/query-suite/actions-security-extended.qls.expected
+++ b/actions/ql/integration-tests/query-suite/actions-security-extended.qls.expected
@@ -1,23 +0,0 @@
-ql/actions/ql/src/Security/CWE-077/EnvPathInjectionCritical.ql
-ql/actions/ql/src/Security/CWE-077/EnvPathInjectionMedium.ql
-ql/actions/ql/src/Security/CWE-077/EnvVarInjectionCritical.ql
-ql/actions/ql/src/Security/CWE-077/EnvVarInjectionMedium.ql
-ql/actions/ql/src/Security/CWE-094/CodeInjectionCritical.ql
-ql/actions/ql/src/Security/CWE-094/CodeInjectionMedium.ql
-ql/actions/ql/src/Security/CWE-1395/UseOfKnownVulnerableAction.ql
-ql/actions/ql/src/Security/CWE-275/MissingActionsPermissions.ql
-ql/actions/ql/src/Security/CWE-285/ImproperAccessControl.ql
-ql/actions/ql/src/Security/CWE-312/ExcessiveSecretsExposure.ql
-ql/actions/ql/src/Security/CWE-312/SecretsInArtifacts.ql
-ql/actions/ql/src/Security/CWE-312/UnmaskedSecretExposure.ql
-ql/actions/ql/src/Security/CWE-349/CachePoisoningViaCodeInjection.ql
-ql/actions/ql/src/Security/CWE-349/CachePoisoningViaDirectCache.ql
-ql/actions/ql/src/Security/CWE-349/CachePoisoningViaPoisonableStep.ql
-ql/actions/ql/src/Security/CWE-367/UntrustedCheckoutTOCTOUCritical.ql
-ql/actions/ql/src/Security/CWE-367/UntrustedCheckoutTOCTOUHigh.ql
-ql/actions/ql/src/Security/CWE-829/ArtifactPoisoningCritical.ql
-ql/actions/ql/src/Security/CWE-829/ArtifactPoisoningMedium.ql
-ql/actions/ql/src/Security/CWE-829/UnpinnedActionsTag.ql
-ql/actions/ql/src/Security/CWE-829/UntrustedCheckoutCritical.ql
-ql/actions/ql/src/Security/CWE-829/UntrustedCheckoutHigh.ql
-ql/actions/ql/src/Security/CWE-829/UntrustedCheckoutMedium.ql
--- a/actions/ql/integration-tests/query-suite/not_included_in_qls.expected
+++ b/actions/ql/integration-tests/query-suite/not_included_in_qls.expected
@@ -1,17 +0,0 @@
-ql/actions/ql/src/Debug/partial.ql
-ql/actions/ql/src/Models/CompositeActionsSinks.ql
-ql/actions/ql/src/Models/CompositeActionsSources.ql
-ql/actions/ql/src/Models/CompositeActionsSummaries.ql
-ql/actions/ql/src/Models/ReusableWorkflowsSinks.ql
-ql/actions/ql/src/Models/ReusableWorkflowsSources.ql
-ql/actions/ql/src/Models/ReusableWorkflowsSummaries.ql
-ql/actions/ql/src/experimental/Security/CWE-074/OutputClobberingHigh.ql
-ql/actions/ql/src/experimental/Security/CWE-078/CommandInjectionCritical.ql
-ql/actions/ql/src/experimental/Security/CWE-078/CommandInjectionMedium.ql
-ql/actions/ql/src/experimental/Security/CWE-088/ArgumentInjectionCritical.ql
-ql/actions/ql/src/experimental/Security/CWE-088/ArgumentInjectionMedium.ql
-ql/actions/ql/src/experimental/Security/CWE-200/SecretExfiltration.ql
-ql/actions/ql/src/experimental/Security/CWE-284/CodeExecutionOnSelfHostedRunner.ql
-ql/actions/ql/src/experimental/Security/CWE-829/ArtifactPoisoningPathTraversal.ql
-ql/actions/ql/src/experimental/Security/CWE-829/UnversionedImmutableAction.ql
-ql/actions/ql/src/experimental/Security/CWE-918/RequestForgery.ql
--- a/actions/ql/integration-tests/query-suite/test.py
+++ b/actions/ql/integration-tests/query-suite/test.py
@@ -1,14 +0,0 @@
-import runs_on
-import pytest
-from query_suites import *
-
-well_known_query_suites = ['actions-code-quality.qls', 'actions-security-and-quality.qls', 'actions-security-extended.qls', 'actions-code-scanning.qls']
-
-@runs_on.posix
-@pytest.mark.parametrize("query_suite", well_known_query_suites)
-def test(codeql, actions, check_query_suite, query_suite):
-    check_query_suite(query_suite)
-
-@runs_on.posix
-def test_not_included_queries(codeql, actions, check_queries_not_included):
-    check_queries_not_included('actions', well_known_query_suites)
--- a/actions/ql/lib/CHANGELOG.md
+++ b/actions/ql/lib/CHANGELOG.md
@@ -1,13 +1,3 @@
-## 0.4.8
-
-No user-facing changes.
-
-## 0.4.7
-
-### New Features
-
-* CodeQL and Copilot Autofix support for GitHub Actions is now Generally Available.
-
 ## 0.4.6

 ### Bug Fixes
--- a/actions/ql/lib/change-notes/released/0.4.7.md
+++ b/actions/ql/lib/change-notes/released/0.4.7.md
@@ -1,5 +0,0 @@
-## 0.4.7
-
-### New Features
-
-* CodeQL and Copilot Autofix support for GitHub Actions is now Generally Available.
--- a/actions/ql/lib/change-notes/released/0.4.8.md
+++ b/actions/ql/lib/change-notes/released/0.4.8.md
@@ -1,3 +0,0 @@
-## 0.4.8
-
-No user-facing changes.
--- a/actions/ql/lib/codeql-pack.release.yml
+++ b/actions/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.4.8
+lastReleaseVersion: 0.4.6
--- a/actions/ql/lib/qlpack.yml
+++ b/actions/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/actions-all
-version: 0.4.8
+version: 0.4.7-dev
 library: true
 warnOnImplicitThis: true
 dependencies:
--- a/actions/ql/src/CHANGELOG.md
+++ b/actions/ql/src/CHANGELOG.md
@@ -1,33 +1,3 @@
-## 0.6.0
-
-### Breaking Changes
-
-* The following queries have been removed from the `security-and-quality` suite.
-  They are not intended to produce user-facing
-  alerts describing vulnerabilities.
-  Any existing alerts for these queries will be closed automatically.
-  * `actions/composite-action-sinks`
-  * `actions/composite-action-sources`
-  * `actions/composite-action-summaries`
-  * `actions/reusable-workflow-sinks`
-    (renamed from `actions/reusable-wokflow-sinks`)
-  * `actions/reusable-workflow-sources`
-  * `actions/reusable-workflow-summaries`
-
-### Bug Fixes
-
-* Assigned a `security-severity` to the query `actions/excessive-secrets-exposure`.
-
-## 0.5.4
-
-### New Features
-
-* CodeQL and Copilot Autofix support for GitHub Actions is now Generally Available.
-
-### Bug Fixes
-
-* Alerts produced by the query `actions/missing-workflow-permissions` now include a minimal set of recommended permissions in the alert message, based on well-known actions seen within the workflow file.
-
 ## 0.5.3

 ### Bug Fixes
--- a/actions/ql/src/Models/ReusableWorkflowsSinks.ql
+++ b/actions/ql/src/Models/ReusableWorkflowsSinks.ql
@@ -5,7 +5,7 @@
 * @problem.severity warning
 * @security-severity 9.3
 * @precision high
- * @id actions/reusable-workflow-sinks
+ * @id actions/reusable-wokflow-sinks
 * @tags actions
 *       model-generator
 *       external/cwe/cwe-020
--- a/actions/ql/src/Security/CWE-077/EnvVarInjectionMedium.md
+++ b/actions/ql/src/Security/CWE-077/EnvVarInjectionMedium.md
@@ -109,7 +109,7 @@ An attacker could craft a malicious artifact that writes dangerous environment v

 ### Exploitation

-An attacker would be able to run arbitrary code by injecting environment variables such as `LD_PRELOAD`, `BASH_ENV`, etc.
+An attacker is be able to run arbitrary code by injecting environment variables such as `LD_PRELOAD`, `BASH_ENV`, etc.

 ## References

--- a/actions/ql/src/Security/CWE-275/MissingActionsPermissions.ql
+++ b/actions/ql/src/Security/CWE-275/MissingActionsPermissions.ql
@@ -1,6 +1,6 @@
 /**
 * @name Workflow does not contain permissions
- * @description Workflows should contain explicit permissions to restrict the scope of the default GITHUB_TOKEN.
+ * @description Workflows should contain permissions to provide a clear understanding has permissions to run the workflow.
 * @kind problem
 * @security-severity 5.0
 * @problem.severity warning
--- a/actions/ql/src/Security/CWE-312/ExcessiveSecretsExposure.ql
+++ b/actions/ql/src/Security/CWE-312/ExcessiveSecretsExposure.ql
@@ -3,7 +3,6 @@
 * @description All organization and repository secrets are passed to the workflow runner.
 * @kind problem
 * @precision high
- * @security-severity 5.0
 * @problem.severity warning
 * @id actions/excessive-secrets-exposure
 * @tags actions
--- a/actions/ql/src/Security/CWE-312/UnmaskedSecretExposure.md
+++ b/actions/ql/src/Security/CWE-312/UnmaskedSecretExposure.md
@@ -2,11 +2,11 @@

 ## Description

-Secrets derived from other secrets are not known to the workflow runner, and therefore are not masked unless explicitly registered.
+Secrets derived from other secrets are not know to the workflow runner and therefore not masked unless explicitly registered.

 ## Recommendations

-Avoid defining non-plain secrets. For example, do not define a new secret containing a JSON object and then read properties out of it from the workflow, since these read values will not be masked by the workflow runner.
+Avoid defining non-plain secrets. For example, do not define a new secret containing a JSON object and then read properties out of it from the workflow since these read values will not be masked by the workflow runner.

 ## Examples

--- a/actions/ql/src/change-notes/2025-02-04-suggest-actions-permissions.md
+++ b/actions/ql/src/change-notes/2025-02-04-suggest-actions-permissions.md
@@ -1,9 +1,4 @@
-## 0.5.4
-
-### New Features
-
-* CodeQL and Copilot Autofix support for GitHub Actions is now Generally Available.
-
-### Bug Fixes
-
-* Alerts produced by the query `actions/missing-workflow-permissions` now include a minimal set of recommended permissions in the alert message, based on well-known actions seen within the workflow file.
+---
+category: fix
+---
+* Alerts produced by the query `actions/missing-workflow-permissions` now include a minimal set of recommended permissions in the alert message, based on well-known actions seen within the workflow file.
--- a/actions/ql/src/change-notes/released/0.6.0.md
+++ b/actions/ql/src/change-notes/released/0.6.0.md
@@ -1,19 +0,0 @@
-## 0.6.0
-
-### Breaking Changes
-
-* The following queries have been removed from the `security-and-quality` suite.
-  They are not intended to produce user-facing
-  alerts describing vulnerabilities.
-  Any existing alerts for these queries will be closed automatically.
-  * `actions/composite-action-sinks`
-  * `actions/composite-action-sources`
-  * `actions/composite-action-summaries`
-  * `actions/reusable-workflow-sinks`
-    (renamed from `actions/reusable-wokflow-sinks`)
-  * `actions/reusable-workflow-sources`
-  * `actions/reusable-workflow-summaries`
-
-### Bug Fixes
-
-* Assigned a `security-severity` to the query `actions/excessive-secrets-exposure`.
--- a/actions/ql/src/codeql-pack.release.yml
+++ b/actions/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.6.0
+lastReleaseVersion: 0.5.3
--- a/actions/ql/src/qlpack.yml
+++ b/actions/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/actions-queries
-version: 0.6.0
+version: 0.5.4-dev
 library: false
 warnOnImplicitThis: true
 groups: [actions, queries]
--- a/config/sync-files.py
+++ b/config/sync-files.py
@@ -58,19 +58,7 @@ def file_checksum(filename):
    with open(filename, 'rb') as file_handle:
        return hashlib.sha1(file_handle.read()).hexdigest()

-def accept_prefix(line1, line2):
-    suffix = line2.removeprefix(line1)
-    return not suffix or suffix.lstrip().startswith("//")
-
-def equivalent_lines(lines1, lines2):
-    if len(lines1) != len(lines2):
-        return False
-    for line1, line2 in zip(lines1, lines2):
-        if not accept_prefix(line1, line2) and not accept_prefix(line2, line1):
-            return False
-    return True
-
-def check_group(group_name, files, master_file_picker, emit_error, accept_prefix):
+def check_group(group_name, files, master_file_picker, emit_error):
    extant_files = [f for f in files if path.isfile(f)]
    if len(extant_files) == 0:
        emit_error(__file__, 0, "No files found from group '" + group_name + "'.")
@@ -82,23 +70,11 @@ def check_group(group_name, files, master_file_picker, emit_error, accept_prefix
        return

    checksums = {file_checksum(f) for f in extant_files}
-    same_lengths = len(extant_files) == len(files)
-    if len(checksums) == 1 and same_lengths:
+
+    if len(checksums) == 1 and len(extant_files) == len(files):
        # All files are present and identical.
        return

-    # In this case we also consider files indentical, if
-    # (1) The group only containts two files.
-    # (2) The lines of one file are the same as the lines of another file
-    # modulo comments.
-    if accept_prefix and same_lengths and len(extant_files) == 2:
-        with open(extant_files[0], 'r') as f1:
-            file1_lines = [l.strip('\n\r') for l in f1.readlines()]
-        with open(extant_files[1], 'r') as f2:
-            file2_lines = [l.strip('\n\r') for l in f2.readlines()]
-        if equivalent_lines(file1_lines, file2_lines):
-            return
-
    master_file = master_file_picker(extant_files)
    if master_file is None:
        emit_error(__file__, 0,
@@ -163,10 +139,9 @@ def sync_identical_files(emit_error):
        raise Exception("Bad command line or file not found")
    chdir_repo_root()
    load_if_exists('.', 'config/identical-files.json')
-    for group_name, files in csharp_test_files().items():
-        check_group(group_name, files, master_file_picker, emit_error, True)
+    file_groups.update(csharp_test_files())
    for group_name, files in file_groups.items():
-        check_group(group_name, files, master_file_picker, emit_error, False)
+        check_group(group_name, files, master_file_picker, emit_error)

 def main():
    sync_identical_files(emit_local_error)
--- a/cpp/downgrades/0f0a390468a5eb43d1dc72937c028070b106bf53/old.dbscheme
+++ b/cpp/downgrades/0f0a390468a5eb43d1dc72937c028070b106bf53/old.dbscheme
--- a/cpp/downgrades/0f0a390468a5eb43d1dc72937c028070b106bf53/semmlecode.cpp.dbscheme
+++ b/cpp/downgrades/0f0a390468a5eb43d1dc72937c028070b106bf53/semmlecode.cpp.dbscheme
--- a/cpp/downgrades/0f0a390468a5eb43d1dc72937c028070b106bf53/upgrade.properties
+++ b/cpp/downgrades/0f0a390468a5eb43d1dc72937c028070b106bf53/upgrade.properties
@@ -1,3 +0,0 @@
-description: Add a new predicate `isVla()` to the `ArrayType` class
-compatibility: full
-type_is_vla.rel: delete
--- a/cpp/downgrades/2e2d805ef93d060b813403cb9b51dc72455a4c68/aggregate_array_init.ql
+++ b/cpp/downgrades/2e2d805ef93d060b813403cb9b51dc72455a4c68/aggregate_array_init.ql
@@ -1,11 +0,0 @@
-class Expr extends @expr {
-  string toString() { none() }
-}
-
-class AggregateLiteral extends Expr, @aggregateliteral {
-  override string toString() { none() }
-}
-
-from AggregateLiteral aggregate, Expr initializer, int element_index, int position
-where aggregate_array_init(aggregate, initializer, element_index, position, _)
-select aggregate, initializer, element_index, position
--- a/cpp/downgrades/2e2d805ef93d060b813403cb9b51dc72455a4c68/aggregate_field_init.ql
+++ b/cpp/downgrades/2e2d805ef93d060b813403cb9b51dc72455a4c68/aggregate_field_init.ql
@@ -1,15 +0,0 @@
-class Expr extends @expr {
-  string toString() { none() }
-}
-
-class AggregateLiteral extends Expr, @aggregateliteral {
-  override string toString() { none() }
-}
-
-class MemberVariable extends @membervariable {
-  string toString() { none() }
-}
-
-from AggregateLiteral aggregate, Expr initializer, MemberVariable field, int position
-where aggregate_field_init(aggregate, initializer, field, position, _)
-select aggregate, initializer, field, position
--- a/cpp/downgrades/2e2d805ef93d060b813403cb9b51dc72455a4c68/old.dbscheme
+++ b/cpp/downgrades/2e2d805ef93d060b813403cb9b51dc72455a4c68/old.dbscheme
--- a/cpp/downgrades/2e2d805ef93d060b813403cb9b51dc72455a4c68/semmlecode.cpp.dbscheme
+++ b/cpp/downgrades/2e2d805ef93d060b813403cb9b51dc72455a4c68/semmlecode.cpp.dbscheme
--- a/cpp/downgrades/2e2d805ef93d060b813403cb9b51dc72455a4c68/upgrade.properties
+++ b/cpp/downgrades/2e2d805ef93d060b813403cb9b51dc72455a4c68/upgrade.properties
@@ -1,4 +0,0 @@
-description: add `hasDesignator` predicate to `ArrayOrVectorAggregateLiteral` and `ClassAggregateLiteral`
-compatibility: backwards
-aggregate_array_init.rel: run aggregate_array_init.qlo
-aggregate_field_init.rel: run aggregate_field_init.qlo
--- a/cpp/downgrades/9a7c3c14c1076f64b871719117a558733d987b48/decltypes.ql
+++ b/cpp/downgrades/9a7c3c14c1076f64b871719117a558733d987b48/decltypes.ql
@@ -1,11 +0,0 @@
-class Type extends @type {
-  string toString() { none() }
-}
-
-class Expr extends @expr {
-  string toString() { none() }
-}
-
-from Type decltype, Expr expr, Type basetype, boolean parentheses
-where decltypes(decltype, expr, _, basetype, parentheses)
-select decltype, expr, basetype, parentheses
--- a/cpp/downgrades/9a7c3c14c1076f64b871719117a558733d987b48/derivedtypes.ql
+++ b/cpp/downgrades/9a7c3c14c1076f64b871719117a558733d987b48/derivedtypes.ql
@@ -1,19 +0,0 @@
-class Type extends @type {
-  string toString() { none() }
-}
-
-predicate derivedType(Type type, string name, int kind, Type type_id) {
-  derivedtypes(type, name, kind, type_id)
-}
-
-predicate typeTransformation(Type type, string name, int kind, Type type_id) {
-  type_operators(type, _, _, type_id) and
-  name = "" and
-  kind = 3 // @type_with_specifiers
-}
-
-from Type type, string name, int kind, Type type_id
-where
-  derivedType(type, name, kind, type_id) or
-  typeTransformation(type, name, kind, type_id)
-select type, name, kind, type_id
--- a/cpp/downgrades/9a7c3c14c1076f64b871719117a558733d987b48/old.dbscheme
+++ b/cpp/downgrades/9a7c3c14c1076f64b871719117a558733d987b48/old.dbscheme
--- a/cpp/downgrades/9a7c3c14c1076f64b871719117a558733d987b48/semmlecode.cpp.dbscheme
+++ b/cpp/downgrades/9a7c3c14c1076f64b871719117a558733d987b48/semmlecode.cpp.dbscheme
--- a/cpp/downgrades/9a7c3c14c1076f64b871719117a558733d987b48/upgrade.properties
+++ b/cpp/downgrades/9a7c3c14c1076f64b871719117a558733d987b48/upgrade.properties
@@ -1,5 +0,0 @@
-description: Support C23 typeof and typeof_unqual
-compatibility: backwards
-decltypes.rel: run decltypes.qlo
-derivedtypes.rel: run derivedtypes.qlo
-type_operators.rel: delete
--- a/cpp/ql/lib/CHANGELOG.md
+++ b/cpp/ql/lib/CHANGELOG.md
@@ -1,19 +1,3 @@
-## 4.3.0
-
-### New Features
-
-* New classes `TypeofType`, `TypeofExprType`, and `TypeofTypeType` were introduced, which represent the C23 `typeof` and `typeof_unqual` operators. The `TypeofExprType` class represents the variant taking an expression as its argument. The `TypeofTypeType` class represents the variant taking a type as its argument.
-* A new class `IntrinsicTransformedType` was introduced, which represents the type transforming intrinsics supported by clang, gcc, and MSVC.
-* Introduced `hasDesignator()` predicates to distinguish between designated and positional initializations for both struct/union fields and array elements.
-* Added the `isVla()` predicate to the `ArrayType` class. This allows queries to identify variable-length arrays (VLAs).
-
-## 4.2.0
-
-### New Features
-
-* Calling conventions explicitly specified on function declarations (`__cdecl`, `__stdcall`, `__fastcall`, etc.)  are now represented as specifiers of those declarations.
-* A new class `CallingConventionSpecifier` extending the `Specifier` class was introduced, which represents explicitly specified calling conventions.
-
 ## 4.1.0

 ### New Features
--- a/cpp/ql/lib/change-notes/2025-03-31-calling-convention.md
+++ b/cpp/ql/lib/change-notes/2025-03-31-calling-convention.md
@@ -1,6 +1,5 @@
-## 4.2.0
-
-### New Features
-
+---
+category: feature
+---
 * Calling conventions explicitly specified on function declarations (`__cdecl`, `__stdcall`, `__fastcall`, etc.)  are now represented as specifiers of those declarations.
 * A new class `CallingConventionSpecifier` extending the `Specifier` class was introduced, which represents explicitly specified calling conventions.
--- a/cpp/ql/lib/change-notes/released/4.3.0.md
+++ b/cpp/ql/lib/change-notes/released/4.3.0.md
@@ -1,8 +0,0 @@
-## 4.3.0
-
-### New Features
-
-* New classes `TypeofType`, `TypeofExprType`, and `TypeofTypeType` were introduced, which represent the C23 `typeof` and `typeof_unqual` operators. The `TypeofExprType` class represents the variant taking an expression as its argument. The `TypeofTypeType` class represents the variant taking a type as its argument.
-* A new class `IntrinsicTransformedType` was introduced, which represents the type transforming intrinsics supported by clang, gcc, and MSVC.
-* Introduced `hasDesignator()` predicates to distinguish between designated and positional initializations for both struct/union fields and array elements.
-* Added the `isVla()` predicate to the `ArrayType` class. This allows queries to identify variable-length arrays (VLAs).
--- a/cpp/ql/lib/codeql-pack.release.yml
+++ b/cpp/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 4.3.0
+lastReleaseVersion: 4.1.0
--- a/cpp/ql/lib/ext/generated/empty.model.yml
+++ b/cpp/ql/lib/ext/generated/empty.model.yml
@@ -1,5 +0,0 @@
-extensions:
-  - addsTo:
-      pack: codeql/cpp-all
-      extensible: summaryModel
-    data: []
--- a/cpp/ql/lib/qlpack.yml
+++ b/cpp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-all
-version: 4.3.0
+version: 4.1.1-dev
 groups: cpp
 dbscheme: semmlecode.cpp.dbscheme
 extractor: cpp
@@ -16,7 +16,6 @@ dependencies:
  codeql/xml: ${workspace}
 dataExtensions:
  - ext/*.model.yml
-  - ext/generated/*.model.yml
  - ext/deallocation/*.model.yml
  - ext/allocation/*.model.yml
 warnOnImplicitThis: true
--- a/cpp/ql/lib/semmle/code/cpp/Print.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Print.qll
@@ -176,30 +176,6 @@ private class DecltypeDumpType extends DumpType, Decltype {
  }
 }

-private class TypeofDumpType extends DumpType, TypeofType {
-  override string getTypeSpecifier() { result = this.getBaseType().(DumpType).getTypeSpecifier() }
-
-  override string getDeclaratorPrefix() {
-    result = this.getBaseType().(DumpType).getDeclaratorPrefix()
-  }
-
-  override string getDeclaratorSuffix() {
-    result = this.getBaseType().(DumpType).getDeclaratorSuffix()
-  }
-}
-
-private class IntrinsicTransformedDumpType extends DumpType, IntrinsicTransformedType {
-  override string getTypeSpecifier() { result = this.getBaseType().(DumpType).getTypeSpecifier() }
-
-  override string getDeclaratorPrefix() {
-    result = this.getBaseType().(DumpType).getDeclaratorPrefix()
-  }
-
-  override string getDeclaratorSuffix() {
-    result = this.getBaseType().(DumpType).getDeclaratorSuffix()
-  }
-}
-
 private class PointerIshDumpType extends DerivedDumpType {
  PointerIshDumpType() {
    this instanceof PointerType or
--- a/cpp/ql/lib/semmle/code/cpp/Type.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Type.qll
@@ -92,9 +92,8 @@ class Type extends Locatable, @type {
  /**
   * Gets this type after typedefs have been resolved.
   *
-   * The result of this predicate will be the type itself, except in the case of a TypedefType, a Decltype,
-   * or a TypeofType, in which case the result will be type which results from (possibly recursively)
-   * resolving typedefs.
+   * The result of this predicate will be the type itself, except in the case of a TypedefType or a Decltype,
+   * in which case the result will be type which results from (possibly recursively) resolving typedefs.
   */
  pragma[nomagic]
  Type getUnderlyingType() { result = this }
@@ -1118,20 +1117,18 @@ class DerivedType extends Type, @derivedtype {
 * decltype(a) b;
 * ```
 */
-class Decltype extends Type {
-  Decltype() { decltypes(underlyingElement(this), _, 0, _, _) }
-
+class Decltype extends Type, @decltype {
  override string getAPrimaryQlClass() { result = "Decltype" }

  /**
-   * Gets the expression whose type is being obtained by this decltype.
+   * The expression whose type is being obtained by this decltype.
   */
-  Expr getExpr() { decltypes(underlyingElement(this), unresolveElement(result), _, _, _) }
+  Expr getExpr() { decltypes(underlyingElement(this), unresolveElement(result), _, _) }

  /**
-   * Gets the type immediately yielded by this decltype.
+   * The type immediately yielded by this decltype.
   */
-  Type getBaseType() { decltypes(underlyingElement(this), _, _, unresolveElement(result), _) }
+  Type getBaseType() { decltypes(underlyingElement(this), _, unresolveElement(result), _) }

  /**
   * Whether an extra pair of parentheses around the expression would change the semantics of this decltype.
@@ -1145,7 +1142,7 @@ class Decltype extends Type {
   * ```
   * Please consult the C++11 standard for more details.
   */
-  predicate parenthesesWouldChangeMeaning() { decltypes(underlyingElement(this), _, _, _, true) }
+  predicate parenthesesWouldChangeMeaning() { decltypes(underlyingElement(this), _, _, true) }

  override Type getUnderlyingType() { result = this.getBaseType().getUnderlyingType() }

@@ -1186,215 +1183,6 @@ class Decltype extends Type {
  }
 }

-/**
- * An instance of the C23 `typeof` or `typeof_unqual` operator. For example:
- * ```
- * int a;
- * typeof(a) b;
- * typeof_unqual(const int) b;
- * ```
- */
-class TypeofType extends Type {
-  TypeofType() {
-    decltypes(underlyingElement(this), _, 1, _, _) or
-    type_operators(underlyingElement(this), _, 0, _)
-  }
-
-  /**
-   * Gets the type immediately yielded by this typeof.
-   */
-  Type getBaseType() {
-    decltypes(underlyingElement(this), _, _, unresolveElement(result), _)
-    or
-    type_operators(underlyingElement(this), _, _, unresolveElement(result))
-  }
-
-  override Type getUnderlyingType() { result = this.getBaseType().getUnderlyingType() }
-
-  override Type stripTopLevelSpecifiers() { result = this.getBaseType().stripTopLevelSpecifiers() }
-
-  override Type stripType() { result = this.getBaseType().stripType() }
-
-  override Type resolveTypedefs() { result = this.getBaseType().resolveTypedefs() }
-
-  override string toString() { result = "typeof(...)" }
-
-  override string getName() { none() }
-
-  override int getSize() { result = this.getBaseType().getSize() }
-
-  override int getAlignment() { result = this.getBaseType().getAlignment() }
-
-  override int getPointerIndirectionLevel() {
-    result = this.getBaseType().getPointerIndirectionLevel()
-  }
-
-  override string explain() {
-    result = "typeof resulting in {" + this.getBaseType().explain() + "}"
-  }
-
-  override predicate involvesReference() { this.getBaseType().involvesReference() }
-
-  override predicate involvesTemplateParameter() { this.getBaseType().involvesTemplateParameter() }
-
-  override predicate isDeeplyConst() { this.getBaseType().isDeeplyConst() }
-
-  override predicate isDeeplyConstBelow() { this.getBaseType().isDeeplyConstBelow() }
-
-  override Specifier internal_getAnAdditionalSpecifier() {
-    result = this.getBaseType().getASpecifier()
-  }
-}
-
-/**
- * An instance of the C23 `typeof` or `typeof_unqual` operator taking an expression
- * as its argument. For example:
- * ```
- * int a;
- * typeof(a) b;
- * ```
- */
-class TypeofExprType extends TypeofType {
-  TypeofExprType() { decltypes(underlyingElement(this), _, 1, _, _) }
-
-  override string getAPrimaryQlClass() { result = "TypeofExprType" }
-
-  /**
-   * Gets the expression whose type is being obtained by this typeof.
-   */
-  Expr getExpr() { decltypes(underlyingElement(this), unresolveElement(result), _, _, _) }
-
-  override Location getLocation() { result = this.getExpr().getLocation() }
-}
-
-/**
- * A type obtained by C23 `typeof` or `typeof_unqual` operator taking a type as its
- * argument. For example:
- * ```
- * typeof_unqual(const int) b;
- * ```
- */
-class TypeofTypeType extends TypeofType {
-  TypeofTypeType() { type_operators(underlyingElement(this), _, 0, _) }
-
-  /**
-   * Gets the expression whose type is being obtained by this typeof.
-   */
-  Type getType() { type_operators(underlyingElement(this), unresolveElement(result), _, _) }
-
-  override string getAPrimaryQlClass() { result = "TypeofTypeType" }
-
-  override string toString() { result = "typeof(...)" }
-}
-
-/**
- * A type obtained by applying a type transforming intrinsic. For example:
- * ```
- * __make_unsigned(int) x;
- * ```
- */
-class IntrinsicTransformedType extends Type {
-  int intrinsic;
-
-  IntrinsicTransformedType() {
-    type_operators(underlyingElement(this), _, intrinsic, _) and
-    intrinsic in [1 .. 19]
-  }
-
-  override string getAPrimaryQlClass() { result = "IntrinsicTransformedType" }
-
-  override string toString() { result = this.getIntrinsicName() + "(...)" }
-
-  /**
-   * Gets the type immediately yielded by this transformation.
-   */
-  Type getBaseType() { type_operators(underlyingElement(this), _, _, unresolveElement(result)) }
-
-  /**
-   * Gets the type that is transformed.
-   */
-  Type getType() { type_operators(underlyingElement(this), unresolveElement(result), _, _) }
-
-  /**
-   * Gets the name of the intrinsic used to transform the type.
-   */
-  string getIntrinsicName() {
-    intrinsic = 1 and result = "__underlying_type"
-    or
-    intrinsic = 2 and result = "__bases"
-    or
-    intrinsic = 3 and result = "__direct_bases"
-    or
-    intrinsic = 4 and result = "__add_lvalue_reference"
-    or
-    intrinsic = 5 and result = "__add_pointer"
-    or
-    intrinsic = 6 and result = "__add_rvalue_reference"
-    or
-    intrinsic = 7 and result = "__decay"
-    or
-    intrinsic = 8 and result = "__make_signed"
-    or
-    intrinsic = 9 and result = "__make_unsigned"
-    or
-    intrinsic = 10 and result = "__remove_all_extents"
-    or
-    intrinsic = 11 and result = "__remove_const"
-    or
-    intrinsic = 12 and result = "__remove_cv"
-    or
-    intrinsic = 13 and result = "__remove_cvref"
-    or
-    intrinsic = 14 and result = "__remove_extent"
-    or
-    intrinsic = 15 and result = "__remove_pointer"
-    or
-    intrinsic = 16 and result = "__remove_reference_t"
-    or
-    intrinsic = 17 and result = "__remove_restrict"
-    or
-    intrinsic = 18 and result = "__remove_volatile"
-    or
-    intrinsic = 19 and result = "__remove_reference"
-  }
-
-  override Type getUnderlyingType() { result = this.getBaseType().getUnderlyingType() }
-
-  override Type stripTopLevelSpecifiers() { result = this.getBaseType().stripTopLevelSpecifiers() }
-
-  override Type stripType() { result = this.getBaseType().stripType() }
-
-  override Type resolveTypedefs() { result = this.getBaseType().resolveTypedefs() }
-
-  override string getName() { none() }
-
-  override int getSize() { result = this.getBaseType().getSize() }
-
-  override int getAlignment() { result = this.getBaseType().getAlignment() }
-
-  override int getPointerIndirectionLevel() {
-    result = this.getBaseType().getPointerIndirectionLevel()
-  }
-
-  override string explain() {
-    result =
-      "application of " + this.getIntrinsicName() + " resulting in {" + this.getBaseType().explain()
-        + "}"
-  }
-
-  override predicate involvesReference() { this.getBaseType().involvesReference() }
-
-  override predicate involvesTemplateParameter() { this.getBaseType().involvesTemplateParameter() }
-
-  override predicate isDeeplyConst() { this.getBaseType().isDeeplyConst() }
-
-  override predicate isDeeplyConstBelow() { this.getBaseType().isDeeplyConstBelow() }
-
-  override Specifier internal_getAnAdditionalSpecifier() {
-    result = this.getBaseType().getASpecifier()
-  }
-}
-
 /**
 * A C/C++ pointer type. See 4.9.1.
 * ```
@@ -1581,11 +1369,6 @@ class ArrayType extends DerivedType {
  override predicate isDeeplyConst() { this.getBaseType().isDeeplyConst() } // No such thing as a const array type

  override predicate isDeeplyConstBelow() { this.getBaseType().isDeeplyConst() }
-
-  /**
-   * Holds if this array is a variable-length array (VLA).
-   */
-  predicate isVla() { type_is_vla(underlyingElement(this)) }
 }

 /**
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/ExternalFlow.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/ExternalFlow.qll
@@ -465,7 +465,7 @@ private predicate isFunctionConstructedFrom(Function f, Function templateFunc) {
 }

 /** Gets the fully templated version of `f`. */
-Function getFullyTemplatedFunction(Function f) {
+private Function getFullyTemplatedFunction(Function f) {
  not f.isFromUninstantiatedTemplate(_) and
  (
    exists(Class c, Class templateClass, int i |
@@ -559,15 +559,12 @@ private string getTypeName(Type t, boolean needsSpace) {

 /**
 * Gets a type name for the `n`'th parameter of `f` without any template
- * arguments.
- *
- * If `canonical = false` then the result may be a string representing a type
- * for which the typedefs have been resolved. If `canonical = true` then the
- * result will be a string representing a type without resolving `typedefs`.
+ * arguments. The result may be a string representing a type for which the
+ * typedefs have been resolved.
 */
 bindingset[f]
 pragma[inline_late]
-string getParameterTypeWithoutTemplateArguments(Function f, int n, boolean canonical) {
+string getParameterTypeWithoutTemplateArguments(Function f, int n) {
  exists(string s, string base, string specifiers, Type t |
    t = f.getParameter(n).getType() and
    // The name of the string can either be the possibly typedefed name
@@ -575,19 +572,14 @@ string getParameterTypeWithoutTemplateArguments(Function f, int n, boolean canon
    // `getTypeName(t, _)` is almost equal to `t.resolveTypedefs().getName()`,
    // except that `t.resolveTypedefs()` doesn't have a result when the
    // resulting type doesn't appear in the database.
-    (
-      s = t.getName() and canonical = true
-      or
-      s = getTypeName(t, _) and canonical = false
-    ) and
+    s = [t.getName(), getTypeName(t, _)] and
    parseAngles(s, base, _, specifiers) and
    result = base + specifiers
  )
  or
  f.isVarargs() and
  n = f.getNumberOfParameters() and
-  result = "..." and
-  canonical = true
+  result = "..."
 }

 /**
@@ -598,7 +590,7 @@ private string getTypeNameWithoutFunctionTemplates(Function f, int n, int remain
  exists(Function templateFunction |
    templateFunction = getFullyTemplatedFunction(f) and
    remaining = templateFunction.getNumberOfTemplateArguments() and
-    result = getParameterTypeWithoutTemplateArguments(templateFunction, n, _)
+    result = getParameterTypeWithoutTemplateArguments(templateFunction, n)
  )
  or
  exists(string mid, TypeTemplateParameter tp, Function templateFunction |
@@ -635,7 +627,7 @@ private string getTypeNameWithoutClassTemplates(Function f, int n, int remaining
 }

 /** Gets the string representation of the `i`'th parameter of `c`. */
-string getParameterTypeName(Function c, int i) {
+private string getParameterTypeName(Function c, int i) {
  result = getTypeNameWithoutClassTemplates(c, i, 0)
 }

--- a/cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll
+++ b/cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll
@@ -310,8 +310,6 @@ class Expr extends StmtParent, @expr {
    or
    exists(Decltype d | d.getExpr() = this.getParentWithConversions*())
    or
-    exists(TypeofExprType t | t.getExpr() = this.getParentWithConversions*())
-    or
    exists(ConstexprIfStmt constIf |
      constIf.getControllingExpr() = this.getParentWithConversions*()
    )
--- a/cpp/ql/lib/semmle/code/cpp/exprs/Literal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/exprs/Literal.qll
@@ -213,24 +213,7 @@ class ClassAggregateLiteral extends AggregateLiteral {
  Expr getFieldExpr(Field field, int position) {
    field = classType.getAField() and
    aggregate_field_init(underlyingElement(this), unresolveElement(result), unresolveElement(field),
-      position, _)
-  }
-
-  /**
-   * Holds if the `position`-th initialization of `field` in this aggregate initializer
-   * uses a designated (e.g., `.x = ...`) rather than a positional initializer.
-   *
-   * For example, in:
-   * ```c
-   * struct S { int x, y; };
-   * struct S s = { .x = 1, 2 };
-   * ```
-   * - `.x = 1` is a designated initializer, therefore `hasDesignator(x, 0)` holds.
-   * - `2` is a positional initializer for `s.y`, therefore `hasDesignator(y, 1)` does not hold.
-   */
-  predicate hasDesignator(Field field, int position) {
-    field = classType.getAField() and
-    aggregate_field_init(underlyingElement(this), _, unresolveElement(field), position, true)
+      position)
  }

  /**
@@ -321,24 +304,7 @@ class ArrayOrVectorAggregateLiteral extends AggregateLiteral {
   * - `a.getElementExpr(0, 2)` gives `789`.
   */
  Expr getElementExpr(int elementIndex, int position) {
-    aggregate_array_init(underlyingElement(this), unresolveElement(result), elementIndex, position,
-      _)
-  }
-
-  /**
-   * Holds if the `position`-th initialization of the array element at `elementIndex`
-   * in this aggregate initializer uses a designated (e.g., `[0] = ...`) rather than
-   * a positional initializer.
-   *
-   * For example, in:
-   * ```c
-   * int x[] = { [0] = 1, 2 };
-   * ```
-   * - `[0] = 1` is a designated initializer, therefore `hasDesignator(0, 0)` holds.
-   * - `2` is a positional initializer for `x[1]`, therefore `hasDesignator(1, 1)` does not hold.
-   */
-  predicate hasDesignator(int elementIndex, int position) {
-    aggregate_array_init(underlyingElement(this), _, elementIndex, position, true)
+    aggregate_array_init(underlyingElement(this), unresolveElement(result), elementIndex, position)
  }

  /**
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll
@@ -371,7 +371,7 @@ private class PrimaryArgumentNode extends ArgumentNode, OperandNode {
  PrimaryArgumentNode() { exists(CallInstruction call | op = call.getAnArgumentOperand()) }

  override predicate argumentOf(DataFlowCall call, ArgumentPosition pos) {
-    op = call.getArgumentOperand(pos.(DirectPosition).getArgumentIndex())
+    op = call.getArgumentOperand(pos.(DirectPosition).getIndex())
  }
 }

@@ -410,16 +410,8 @@ class ParameterPosition = Position;
 class ArgumentPosition = Position;

 abstract class Position extends TPosition {
-  /** Gets a textual representation of this position. */
  abstract string toString();

-  /**
-   * Gets the argument index of this position. The qualifier of a call has
-   * argument index `-1`.
-   */
-  abstract int getArgumentIndex();
-
-  /** Gets the indirection index of this position. */
  abstract int getIndirectionIndex();
 }

@@ -436,7 +428,7 @@ class DirectPosition extends Position, TDirectPosition {
    result = index.toString()
  }

-  override int getArgumentIndex() { result = index }
+  int getIndex() { result = index }

  final override int getIndirectionIndex() { result = 0 }
 }
@@ -453,29 +445,16 @@ class IndirectionPosition extends Position, TIndirectionPosition {
    else result = repeatStars(indirectionIndex) + argumentIndex.toString()
  }

-  override int getArgumentIndex() { result = argumentIndex }
+  int getArgumentIndex() { result = argumentIndex }

  final override int getIndirectionIndex() { result = indirectionIndex }
 }

 newtype TPosition =
-  TDirectPosition(int argumentIndex) {
-    exists(any(CallInstruction c).getArgument(argumentIndex))
-    or
-    // Handle the rare case where there is a function definition but no call to
-    // the function.
-    exists(any(Cpp::Function f).getParameter(argumentIndex))
-  } or
+  TDirectPosition(int argumentIndex) { exists(any(CallInstruction c).getArgument(argumentIndex)) } or
  TIndirectionPosition(int argumentIndex, int indirectionIndex) {
    Ssa::hasIndirectOperand(any(CallInstruction call).getArgumentOperand(argumentIndex),
      indirectionIndex)
-    or
-    // Handle the rare case where there is a function definition but no call to
-    // the function.
-    exists(Cpp::Function f, Cpp::Parameter p |
-      p = f.getParameter(argumentIndex) and
-      indirectionIndex = [1 .. Ssa::getMaxIndirectionsForType(p.getUnspecifiedType()) - 1]
-    )
  }

 private newtype TReturnKind =
@@ -522,15 +501,6 @@ class ReturnKind extends TReturnKind {

  /** Gets a textual representation of this return kind. */
  abstract string toString();
-
-  /** Holds if this `ReturnKind` is generated from a `return` statement. */
-  abstract predicate isNormalReturn();
-
-  /**
-   * Holds if this `ReturnKind` is generated from a write to the parameter with
-   * index `argumentIndex`
-   */
-  abstract predicate isIndirectReturn(int argumentIndex);
 }

 /**
@@ -544,10 +514,6 @@ class NormalReturnKind extends ReturnKind, TNormalReturnKind {
  override int getIndirectionIndex() { result = indirectionIndex }

  override string toString() { result = "indirect return" }
-
-  override predicate isNormalReturn() { any() }
-
-  override predicate isIndirectReturn(int argumentIndex) { none() }
 }

 /**
@@ -562,10 +528,6 @@ private class IndirectReturnKind extends ReturnKind, TIndirectReturnKind {
  override int getIndirectionIndex() { result = indirectionIndex }

  override string toString() { result = "indirect outparam[" + argumentIndex.toString() + "]" }
-
-  override predicate isNormalReturn() { none() }
-
-  override predicate isIndirectReturn(int argumentIndex_) { argumentIndex_ = argumentIndex }
 }

 /** A data flow node that occurs as the result of a `ReturnStmt`. */
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll
@@ -1445,7 +1445,7 @@ private class ExplicitParameterInstructionNode extends AbstractExplicitParameter
  ExplicitParameterInstructionNode() { exists(instr.getParameter()) }

  override predicate isSourceParameterOf(Function f, ParameterPosition pos) {
-    f.getParameter(pos.(DirectPosition).getArgumentIndex()) = instr.getParameter()
+    f.getParameter(pos.(DirectPosition).getIndex()) = instr.getParameter()
  }

  override string toStringImpl() { result = instr.getParameter().toString() }
@@ -1460,7 +1460,7 @@ class ThisParameterInstructionNode extends AbstractExplicitParameterNode,
  ThisParameterInstructionNode() { instr.getIRVariable() instanceof IRThisVariable }

  override predicate isSourceParameterOf(Function f, ParameterPosition pos) {
-    pos.(DirectPosition).getArgumentIndex() = -1 and
+    pos.(DirectPosition).getIndex() = -1 and
    instr.getEnclosingFunction() = f
  }

@@ -1494,7 +1494,7 @@ private class DirectBodyLessParameterNode extends AbstractExplicitParameterNode,

  override predicate isSourceParameterOf(Function f, ParameterPosition pos) {
    this.getFunction() = f and
-    f.getParameter(pos.(DirectPosition).getArgumentIndex()) = p
+    f.getParameter(pos.(DirectPosition).getIndex()) = p
  }

  override Parameter getParameter() { result = p }
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TaintTrackingUtil.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TaintTrackingUtil.qll
@@ -229,11 +229,11 @@ private module SpeculativeTaintFlow {
      not exists(DataFlowDispatch::viableCallable(call)) and
      src.(DataFlowPrivate::ArgumentNode).argumentOf(call, argpos)
    |
-      not argpos.(DirectPosition).getArgumentIndex() = -1 and
+      not argpos.(DirectPosition).getIndex() = -1 and
      sink.(PostUpdateNode)
          .getPreUpdateNode()
          .(DataFlowPrivate::ArgumentNode)
-          .argumentOf(call, any(DirectPosition qualpos | qualpos.getArgumentIndex() = -1))
+          .argumentOf(call, any(DirectPosition qualpos | qualpos.getIndex() = -1))
      or
      sink.(DataFlowPrivate::OutNode).getCall() = call
    )
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/SideEffects.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/SideEffects.qll
@@ -16,10 +16,6 @@ private predicate isDeeplyConst(Type t) {
  or
  isDeeplyConst(t.(Decltype).getBaseType())
  or
-  isDeeplyConst(t.(TypeofType).getBaseType())
-  or
-  isDeeplyConst(t.(IntrinsicTransformedType).getBaseType())
-  or
  isDeeplyConst(t.(ReferenceType).getBaseType())
  or
  exists(SpecifiedType specType | specType = t |
@@ -40,10 +36,6 @@ private predicate isDeeplyConstBelow(Type t) {
  or
  isDeeplyConstBelow(t.(Decltype).getBaseType())
  or
-  isDeeplyConstBelow(t.(TypeofType).getBaseType())
-  or
-  isDeeplyConstBelow(t.(IntrinsicTransformedType).getBaseType())
-  or
  isDeeplyConst(t.(PointerType).getBaseType())
  or
  isDeeplyConst(t.(ReferenceType).getBaseType())
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme
@@ -743,17 +743,15 @@ typedefbase(
 );

 /**
- * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
- * operator taking an expression as its argument.  For example:
+ * An instance of the C++11 `decltype` operator.  For example:
 * ```
 * int a;
 * decltype(1+a) b;
- * typeof(1+a) c;
 * ```
 * Here `expr` is `1+a`.
 *
 * Sometimes an additional pair of parentheses around the expression
- * changes the semantics of the decltype, e.g.
+ * would change the semantics of this decltype, e.g.
 * ```
 * struct A { double x; };
 * const A* a = new A();
@@ -763,55 +761,14 @@ typedefbase(
 * (Please consult the C++11 standard for more details).
 * `parentheses_would_change_meaning` is `true` iff that is the case.
 */
-
-/*
-case @decltype.kind of
-|  0 = @decltype
-|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
-;
-*/
-
 #keyset[id, expr]
 decltypes(
    int id: @decltype,
    int expr: @expr ref,
-    int kind: int ref,
    int base_type: @type ref,
    boolean parentheses_would_change_meaning: boolean ref
 );

-/*
-case @type_operator.kind of
-|  0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
-|  1 = @underlying_type
-|  2 = @bases
-|  3 = @direct_bases
-|  4 = @add_lvalue_reference
-|  5 = @add_pointer
-|  6 = @add_rvalue_reference
-|  7 = @decay
-|  8 = @make_signed
-|  9 = @make_unsigned
-| 10 = @remove_all_extents
-| 11 = @remove_const
-| 12 = @remove_cv
-| 13 = @remove_cvref
-| 14 = @remove_extent
-| 15 = @remove_pointer
-| 16 = @remove_reference_t
-| 17 = @remove_restrict
-| 18 = @remove_volatile
-| 19 = @remove_reference
-;
-*/
-
-type_operators(
-    unique int id: @type_operator,
-    int arg_type: @type ref,
-    int kind: int ref,
-    int base_type: @type ref
-)
-
 /*
 case @usertype.kind of
 |  0 = @unknown_usertype
@@ -1146,10 +1103,10 @@ stmtattributes(
@type = @builtintype
      | @derivedtype
      | @usertype
+      /* TODO | @fixedpointtype */
      | @routinetype
      | @ptrtomember
-      | @decltype
-      | @type_operator;
+      | @decltype;

 unspecifiedtype(
    unique int type_id: @type ref,
@@ -2082,8 +2039,7 @@ aggregate_field_init(
    int aggregate: @aggregateliteral ref,
    int initializer: @expr ref,
    int field: @membervariable ref,
-    int position: int ref,
-    boolean is_designated: boolean ref
+    int position: int ref
 );

 /**
@@ -2095,8 +2051,7 @@ aggregate_array_init(
    int aggregate: @aggregateliteral ref,
    int initializer: @expr ref,
    int element_index: int ref,
-    int position: int ref,
-    boolean is_designated: boolean ref
+    int position: int ref
 );

@ctorinit = @ctordirectinit
@@ -2223,8 +2178,6 @@ variable_vla(
    int decl: @stmt_vla_decl ref
 );

-type_is_vla(unique int type_id: @derivedtype ref)
-
 if_initialization(
    unique int if_stmt: @stmt_if ref,
    int init_id: @stmt ref
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
--- a/cpp/ql/lib/upgrades/0f0a390468a5eb43d1dc72937c028070b106bf53/aggregate_array_init.ql
+++ b/cpp/ql/lib/upgrades/0f0a390468a5eb43d1dc72937c028070b106bf53/aggregate_array_init.ql
@@ -1,11 +0,0 @@
-class Expr extends @expr {
-  string toString() { none() }
-}
-
-class AggregateLiteral extends Expr, @aggregateliteral {
-  override string toString() { none() }
-}
-
-from AggregateLiteral aggregate, Expr initializer, int element_index, int position
-where aggregate_array_init(aggregate, initializer, element_index, position)
-select aggregate, initializer, element_index, position, false
--- a/cpp/ql/lib/upgrades/0f0a390468a5eb43d1dc72937c028070b106bf53/aggregate_field_init.ql
+++ b/cpp/ql/lib/upgrades/0f0a390468a5eb43d1dc72937c028070b106bf53/aggregate_field_init.ql
@@ -1,15 +0,0 @@
-class Expr extends @expr {
-  string toString() { none() }
-}
-
-class AggregateLiteral extends Expr, @aggregateliteral {
-  override string toString() { none() }
-}
-
-class MemberVariable extends @membervariable {
-  string toString() { none() }
-}
-
-from AggregateLiteral aggregate, Expr initializer, MemberVariable field, int position
-where aggregate_field_init(aggregate, initializer, field, position)
-select aggregate, initializer, field, position, false
--- a/cpp/ql/lib/upgrades/0f0a390468a5eb43d1dc72937c028070b106bf53/old.dbscheme
+++ b/cpp/ql/lib/upgrades/0f0a390468a5eb43d1dc72937c028070b106bf53/old.dbscheme
--- a/cpp/ql/lib/upgrades/0f0a390468a5eb43d1dc72937c028070b106bf53/semmlecode.cpp.dbscheme
+++ b/cpp/ql/lib/upgrades/0f0a390468a5eb43d1dc72937c028070b106bf53/semmlecode.cpp.dbscheme
--- a/cpp/ql/lib/upgrades/0f0a390468a5eb43d1dc72937c028070b106bf53/upgrade.properties
+++ b/cpp/ql/lib/upgrades/0f0a390468a5eb43d1dc72937c028070b106bf53/upgrade.properties
@@ -1,4 +0,0 @@
-description: add `hasDesignator` predicate to `ArrayOrVectorAggregateLiteral` and `ClassAggregateLiteral`
-compatibility: backwards
-aggregate_array_init.rel: run aggregate_array_init.qlo
-aggregate_field_init.rel: run aggregate_field_init.qlo
--- a/cpp/ql/lib/upgrades/2e2d805ef93d060b813403cb9b51dc72455a4c68/decltypes.ql
+++ b/cpp/ql/lib/upgrades/2e2d805ef93d060b813403cb9b51dc72455a4c68/decltypes.ql
@@ -1,11 +0,0 @@
-class Type extends @type {
-  string toString() { none() }
-}
-
-class Expr extends @expr {
-  string toString() { none() }
-}
-
-from Type decltype, Expr expr, Type basetype, boolean parentheses
-where decltypes(decltype, expr, basetype, parentheses)
-select decltype, expr, 0, basetype, parentheses
--- a/cpp/ql/lib/upgrades/2e2d805ef93d060b813403cb9b51dc72455a4c68/old.dbscheme
+++ b/cpp/ql/lib/upgrades/2e2d805ef93d060b813403cb9b51dc72455a4c68/old.dbscheme
--- a/cpp/ql/lib/upgrades/2e2d805ef93d060b813403cb9b51dc72455a4c68/semmlecode.cpp.dbscheme
+++ b/cpp/ql/lib/upgrades/2e2d805ef93d060b813403cb9b51dc72455a4c68/semmlecode.cpp.dbscheme
--- a/cpp/ql/lib/upgrades/2e2d805ef93d060b813403cb9b51dc72455a4c68/upgrade.properties
+++ b/cpp/ql/lib/upgrades/2e2d805ef93d060b813403cb9b51dc72455a4c68/upgrade.properties
@@ -1,3 +0,0 @@
-description: Support C23 typeof and typeof_unqual
-compatibility: partial
-decltypes.rel: run decltypes.qlo
--- a/cpp/ql/lib/upgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/old.dbscheme
+++ b/cpp/ql/lib/upgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/old.dbscheme
--- a/cpp/ql/lib/upgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/semmlecode.cpp.dbscheme
+++ b/cpp/ql/lib/upgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/semmlecode.cpp.dbscheme
--- a/cpp/ql/lib/upgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/upgrade.properties
+++ b/cpp/ql/lib/upgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/upgrade.properties
@@ -1,2 +0,0 @@
-description:  Add a new predicate `isVla()` to the `ArrayType` class
-compatibility: backwards
--- a/cpp/ql/src/CHANGELOG.md
+++ b/cpp/ql/src/CHANGELOG.md
@@ -1,11 +1,3 @@
-## 1.3.9
-
-No user-facing changes.
-
-## 1.3.8
-
-No user-facing changes.
-
 ## 1.3.7

 ### Minor Analysis Improvements
--- a/Bugs/Arithmetic/IntMultToLong.ql
+++ b/Bugs/Arithmetic/IntMultToLong.ql
@@ -179,7 +179,6 @@ predicate overflows(MulExpr me, Type t) {

 from MulExpr me, Type t1, Type t2
 where
-  not any(Compilation c).buildModeNone() and
  t1 = me.getType().getUnderlyingType() and
  t2 = me.getConversion().getType().getUnderlyingType() and
  t1.getSize() < t2.getSize() and
--- a/Bugs/Format/WrongTypeFormatArguments.ql
+++ b/Bugs/Format/WrongTypeFormatArguments.ql
@@ -154,7 +154,6 @@ int sizeof_IntType() { exists(IntType it | result = it.getSize()) }

 from FormattingFunctionCall ffc, int n, Expr arg, Type expected, Type actual
 where
-  not any(Compilation c).buildModeNone() and
  (
    formattingFunctionCallExpectedType(ffc, n, expected) and
    formattingFunctionCallActualType(ffc, n, arg, actual) and
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Óscar San José	1ac3e80e96	Fix typo in test setting	2025-04-04 15:02:51 +02:00
Óscar San José	7da9eab3a4	Use sudo nice with more local testing servers, to avoid timeouts in macos-15	2025-04-04 14:24:57 +02:00
@@ -1 +1 @@
 .1.1
 .0.0