set CompileForOverlayEval in java pack

2026-05-16 12:17:07 +02:00 · 2025-07-03 16:46:22 +01:00
1154 changed files with 27914 additions and 78051 deletions
--- a/.github/workflows/go-tests-other-os.yml
+++ b/.github/workflows/go-tests-other-os.yml
@@ -0,0 +1,35 @@
+name: "Go: Run Tests - Other OS"
+on:
+  pull_request:
+    paths:
+      - "go/**"
+      - "!go/documentation/**"
+      - "!go/ql/**" # don't run other-os if only ql/ files changed
+      - .github/workflows/go-tests-other-os.yml
+      - .github/actions/**
+      - codeql-workspace.yml
+      - MODULE.bazel
+      - .bazelrc
+      - misc/bazel/**
+
+permissions:
+  contents: read
+
+jobs:
+  test-mac:
+    name: Test MacOS
+    runs-on: macos-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+      - name: Run tests
+        uses: ./go/actions/test
+
+  test-win:
+    name: Test Windows
+    runs-on: windows-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+      - name: Run tests
+        uses: ./go/actions/test
--- a/.github/workflows/go-tests-rtjo.yml
+++ b/.github/workflows/go-tests-rtjo.yml
@@ -0,0 +1,22 @@
+name: "Go: Run RTJO Tests"
+on:
+  pull_request:
+    types:
+      - labeled
+
+permissions:
+  contents: read
+
+jobs:
+  test-linux:
+    if: "github.repository_owner == 'github' && github.event.label.name == 'Run: RTJO Language Tests'"
+    name: RTJO Test Linux (Ubuntu)
+    runs-on: ubuntu-latest-xl
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+      - name: Run tests
+        uses: ./go/actions/test
+        with:
+          run-code-checks: true
+          dynamic-join-order-mode: all
--- a/.github/workflows/go-tests.yml
+++ b/.github/workflows/go-tests.yml
@@ -1,6 +1,6 @@
 name: "Go: Run Tests"
 on:
-  pull_request:
+  push:
    paths:
      - "go/**"
      - "!go/documentation/**"
@@ -8,6 +8,17 @@ on:
      - .github/workflows/go-tests.yml
      - .github/actions/**
      - codeql-workspace.yml
+    branches:
+      - main
+      - "rc/*"
+  pull_request:
+    paths:
+      - "go/**"
+      - "!go/documentation/**"      
+      - "shared/**"
+      - .github/workflows/go-tests.yml
+      - .github/actions/**
+      - codeql-workspace.yml
      - MODULE.bazel
      - .bazelrc
      - misc/bazel/**
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -37,7 +37,6 @@ bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True
 # the versions there are canonical, the versions here are used for CI in github/codeql, as well as for the vendoring of dependencies.
 RUST_EDITION = "2024"

-# run buildutils-internal/scripts/fill-rust-sha256s.py when updating (internal repo)
 RUST_VERSION = "1.86.0"

 rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
@@ -48,29 +47,6 @@ rust.toolchain(
        "x86_64-apple-darwin",
        "aarch64-apple-darwin",
    ],
-    # generated by buildutils-internal/scripts/fill-rust-sha256s.py (internal repo)
-    sha256s = {
-        "rustc-1.86.0-x86_64-unknown-linux-gnu.tar.xz": "4438b809ce4a083af31ed17aeeedcc8fc60ccffc0625bef1926620751b6989d7",
-        "rustc-1.86.0-x86_64-apple-darwin.tar.xz": "42b76253626febb7912541a30d3379f463dec89581aad4cb72c6c04fb5a71dc5",
-        "rustc-1.86.0-aarch64-apple-darwin.tar.xz": "23b8f52102249a47ab5bc859d54c9a3cb588a3259ba3f00f557d50edeca4fde9",
-        "rustc-1.86.0-x86_64-pc-windows-msvc.tar.xz": "fdde839fea274529a31e51eb85c6df1782cc8479c9d1bc24e2914d66a0de41ab",
-        "clippy-1.86.0-x86_64-unknown-linux-gnu.tar.xz": "02aaff2c1407d2da8dba19aa4970dd873e311902b120a66cbcdbe51eb8836edf",
-        "clippy-1.86.0-x86_64-apple-darwin.tar.xz": "bb85efda7bbffaf124867f5ca36d50932b1e8f533c62ee923438afb32ff8fe9a",
-        "clippy-1.86.0-aarch64-apple-darwin.tar.xz": "239fa3a604b124f0312f2af08537874a1227dba63385484b468cca62e7c4f2f2",
-        "clippy-1.86.0-x86_64-pc-windows-msvc.tar.xz": "d00498f47d49219f032e2c5eeebdfc3d32317c0dc3d3fd7125327445bc482cb4",
-        "cargo-1.86.0-x86_64-unknown-linux-gnu.tar.xz": "c5c1590f7e9246ad9f4f97cfe26ffa92707b52a769726596a9ef81565ebd908b",
-        "cargo-1.86.0-x86_64-apple-darwin.tar.xz": "af163eb02d1a178044d1b4f2375960efd47130f795f6e33d09e345454bb26f4e",
-        "cargo-1.86.0-aarch64-apple-darwin.tar.xz": "3cb13873d48c3e1e4cc684d42c245226a11fba52af6b047c3346ed654e7a05c0",
-        "cargo-1.86.0-x86_64-pc-windows-msvc.tar.xz": "e57a9d89619b5604899bac443e68927bdd371e40f2e03e18950b6ceb3eb67966",
-        "llvm-tools-1.86.0-x86_64-unknown-linux-gnu.tar.xz": "282145ab7a63c98b625856f44b905b4dc726b497246b824632a5790debe95a78",
-        "llvm-tools-1.86.0-x86_64-apple-darwin.tar.xz": "b55706e92f7da989207c50c13c7add483a9fedd233bc431b106eca2a8f151ec9",
-        "llvm-tools-1.86.0-aarch64-apple-darwin.tar.xz": "04d3618c686845853585f036e3211eb9e18f2d290f4610a7a78bdc1fcce1ebd9",
-        "llvm-tools-1.86.0-x86_64-pc-windows-msvc.tar.xz": "721a17cc8dc219177e4277a3592253934ef08daa1e1b12eda669a67d15fad8dd",
-        "rust-std-1.86.0-x86_64-unknown-linux-gnu.tar.xz": "67be7184ea388d8ce0feaf7fdea46f1775cfc2970930264343b3089898501d37",
-        "rust-std-1.86.0-x86_64-apple-darwin.tar.xz": "3b1140d54870a080080e84700143f4a342fbd02a410a319b05d9c02e7dcf44cc",
-        "rust-std-1.86.0-aarch64-apple-darwin.tar.xz": "0fb121fb3b8fa9027d79ff598500a7e5cd086ddbc3557482ed3fdda00832c61b",
-        "rust-std-1.86.0-x86_64-pc-windows-msvc.tar.xz": "3d5354b7b9cb950b58bff3fce18a652aa374bb30c8f70caebd3bd0b43cb41a33",
-    },
    versions = [RUST_VERSION],
 )
 use_repo(rust, "rust_toolchains")
@@ -230,7 +206,6 @@ use_repo(
    "kotlin-compiler-2.1.0-Beta1",
    "kotlin-compiler-2.1.20-Beta1",
    "kotlin-compiler-2.2.0-Beta1",
-    "kotlin-compiler-2.2.20-Beta2",
    "kotlin-compiler-embeddable-1.6.0",
    "kotlin-compiler-embeddable-1.6.20",
    "kotlin-compiler-embeddable-1.7.0",
@@ -243,7 +218,6 @@ use_repo(
    "kotlin-compiler-embeddable-2.1.0-Beta1",
    "kotlin-compiler-embeddable-2.1.20-Beta1",
    "kotlin-compiler-embeddable-2.2.0-Beta1",
-    "kotlin-compiler-embeddable-2.2.20-Beta2",
    "kotlin-stdlib-1.6.0",
    "kotlin-stdlib-1.6.20",
    "kotlin-stdlib-1.7.0",
@@ -256,7 +230,6 @@ use_repo(
    "kotlin-stdlib-2.1.0-Beta1",
    "kotlin-stdlib-2.1.20-Beta1",
    "kotlin-stdlib-2.2.0-Beta1",
-    "kotlin-stdlib-2.2.20-Beta2",
 )

 go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
--- a/actions/ql/lib/CHANGELOG.md
+++ b/actions/ql/lib/CHANGELOG.md
@@ -1,13 +1,3 @@
-## 0.4.14
-
-No user-facing changes.
-
-## 0.4.13
-
-### Bug Fixes
-
-* The `actions/artifact-poisoning/critical` and `actions/artifact-poisoning/medium` queries now exclude artifacts downloaded to `$[{ runner.temp }}` in addition to `/tmp`.
-
 ## 0.4.12

 ### Minor Analysis Improvements
--- a/actions/ql/lib/change-notes/released/0.4.13.md
+++ b/actions/ql/lib/change-notes/released/0.4.13.md
@@ -1,5 +0,0 @@
-## 0.4.13
-
-### Bug Fixes
-
-* The `actions/artifact-poisoning/critical` and `actions/artifact-poisoning/medium` queries now exclude artifacts downloaded to `$[{ runner.temp }}` in addition to `/tmp`.
--- a/actions/ql/lib/change-notes/released/0.4.14.md
+++ b/actions/ql/lib/change-notes/released/0.4.14.md
@@ -1,3 +0,0 @@
-## 0.4.14
-
-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.14
+lastReleaseVersion: 0.4.12
--- a/actions/ql/lib/codeql/actions/Helper.qll
+++ b/actions/ql/lib/codeql/actions/Helper.qll
@@ -72,7 +72,7 @@ string normalizePath(string path) {
      then result = path
      else
        // foo -> GITHUB_WORKSPACE/foo
-        if path.regexpMatch("^[^$/~].*")
+        if path.regexpMatch("^[^/~].*")
        then result = "GITHUB_WORKSPACE/" + path.regexpReplaceAll("/$", "")
        else
          // ~/foo -> ~/foo
--- a/actions/ql/lib/codeql/actions/security/ArtifactPoisoningQuery.qll
+++ b/actions/ql/lib/codeql/actions/security/ArtifactPoisoningQuery.qll
@@ -262,10 +262,8 @@ class ArtifactPoisoningSink extends DataFlow::Node {

  ArtifactPoisoningSink() {
    download.getAFollowingStep() = poisonable and
-    // excluding artifacts downloaded to the temporary directory
+    // excluding artifacts downloaded to /tmp
    not download.getPath().regexpMatch("^/tmp.*") and
-    not download.getPath().regexpMatch("^\\$\\{\\{\\s*runner\\.temp\\s*}}.*") and
-    not download.getPath().regexpMatch("^\\$RUNNER_TEMP.*") and
    (
      poisonable.(Run).getScript() = this.asExpr() and
      (
--- a/actions/ql/lib/qlpack.yml
+++ b/actions/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/actions-all
-version: 0.4.14
+version: 0.4.13-dev
 library: true
 warnOnImplicitThis: true
 dependencies:
--- a/actions/ql/src/CHANGELOG.md
+++ b/actions/ql/src/CHANGELOG.md
@@ -1,11 +1,3 @@
-## 0.6.6
-
-No user-facing changes.
-
-## 0.6.5
-
-No user-facing changes.
-
 ## 0.6.4

 No user-facing changes.
--- a/actions/ql/src/change-notes/released/0.6.5.md
+++ b/actions/ql/src/change-notes/released/0.6.5.md
@@ -1,3 +0,0 @@
-## 0.6.5
-
-No user-facing changes.
--- a/actions/ql/src/change-notes/released/0.6.6.md
+++ b/actions/ql/src/change-notes/released/0.6.6.md
@@ -1,3 +0,0 @@
-## 0.6.6
-
-No user-facing changes.
--- a/actions/ql/src/codeql-pack.release.yml
+++ b/actions/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.6.6
+lastReleaseVersion: 0.6.4
--- a/actions/ql/src/qlpack.yml
+++ b/actions/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/actions-queries
-version: 0.6.6
+version: 0.6.5-dev
 library: false
 warnOnImplicitThis: true
 groups: [actions, queries]
--- a/actions/ql/test/query-tests/Security/CWE-829/.github/workflows/artifactpoisoning93.yml
+++ b/actions/ql/test/query-tests/Security/CWE-829/.github/workflows/artifactpoisoning93.yml
@@ -1,19 +0,0 @@
-on:
-  workflow_run:
-    workflows:
-      - Benchmark
-    types:
-      - completed
-
-jobs:
-  benchmark:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Download From PR
-        uses: actions/download-artifact@v4
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          run-id: ${{ github.event.workflow_run.id }}
-          path: ${{ runner.temp }}/artifacts/
-      - run: npm install
--- a/actions/ql/test/query-tests/Security/CWE-829/.github/workflows/artifactpoisoning94.yml
+++ b/actions/ql/test/query-tests/Security/CWE-829/.github/workflows/artifactpoisoning94.yml
@@ -1,19 +0,0 @@
-on:
-  workflow_run:
-    workflows:
-      - Benchmark
-    types:
-      - completed
-
-jobs:
-  benchmark:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Download From PR
-        uses: actions/download-artifact@v4
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          run-id: ${{ github.event.workflow_run.id }}
-          path: /tmp/artifacts/
-      - run: npm install
--- a/actions/ql/test/query-tests/Security/CWE-829/.github/workflows/artifactpoisoning95.yml
+++ b/actions/ql/test/query-tests/Security/CWE-829/.github/workflows/artifactpoisoning95.yml
@@ -1,19 +0,0 @@
-on:
-  workflow_run:
-    workflows:
-      - Benchmark
-    types:
-      - completed
-
-jobs:
-  benchmark:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Download From PR
-        uses: actions/download-artifact@v4
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          run-id: ${{ github.event.workflow_run.id }}
-          path: $RUNNER_TEMP/artifacts/
-      - run: npm install
--- a/actions/ql/test/query-tests/Security/CWE-829/.github/workflows/artifactpoisoning96.yml
+++ b/actions/ql/test/query-tests/Security/CWE-829/.github/workflows/artifactpoisoning96.yml
@@ -1,18 +0,0 @@
-on:
-  workflow_run:
-    workflows:
-      - Benchmark
-    types:
-      - completed
-
-jobs:
-  benchmark:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Download From PR
-        uses: actions/download-artifact@v4
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          run-id: ${{ github.event.workflow_run.id }}
-      - run: npm install
--- a/actions/ql/test/query-tests/Security/CWE-829/.github/workflows/artifactpoisoning97.yml
+++ b/actions/ql/test/query-tests/Security/CWE-829/.github/workflows/artifactpoisoning97.yml
@@ -1,19 +0,0 @@
-on:
-  workflow_run:
-    workflows:
-      - Benchmark
-    types:
-      - completed
-
-jobs:
-  benchmark:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Download From PR
-        uses: actions/download-artifact@v4
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          run-id: ${{ github.event.workflow_run.id }}
-          path: ${{  runner.temp  }}/artifacts/
-      - run: npm install
--- a/actions/ql/test/query-tests/Security/CWE-829/ArtifactPoisoningCritical.expected
+++ b/actions/ql/test/query-tests/Security/CWE-829/ArtifactPoisoningCritical.expected
@@ -13,7 +13,6 @@ edges
 | .github/workflows/artifactpoisoning42.yml:13:9:21:6 | Run Step | .github/workflows/artifactpoisoning42.yml:22:14:22:18 | ./cmd | provenance | Config |
 | .github/workflows/artifactpoisoning71.yml:9:9:16:6 | Uses Step | .github/workflows/artifactpoisoning71.yml:17:14:18:40 | sed -f config foo.md > bar.md\n | provenance | Config |
 | .github/workflows/artifactpoisoning81.yml:28:9:31:6 | Uses Step | .github/workflows/artifactpoisoning81.yml:31:14:31:27 | python test.py | provenance | Config |
-| .github/workflows/artifactpoisoning96.yml:13:9:18:6 | Uses Step | .github/workflows/artifactpoisoning96.yml:18:14:18:24 | npm install | provenance | Config |
 | .github/workflows/artifactpoisoning101.yml:10:9:16:6 | Uses Step | .github/workflows/artifactpoisoning101.yml:17:14:19:59 | PR_NUMBER=$(./get_pull_request_number.sh pr_number.txt)\necho "PR_NUMBER=$PR_NUMBER" >> $GITHUB_OUTPUT \n | provenance | Config |
 | .github/workflows/test18.yml:12:15:33:12 | Uses Step | .github/workflows/test18.yml:36:15:40:58 | Uses Step | provenance | Config |
 | .github/workflows/test25.yml:22:9:32:6 | Uses Step: downloadBuildScan | .github/workflows/test25.yml:39:14:40:45 | ./gradlew buildScanPublishPrevious\n | provenance | Config |
@@ -45,8 +44,6 @@ nodes
 | .github/workflows/artifactpoisoning81.yml:31:14:31:27 | python test.py | semmle.label | python test.py |
 | .github/workflows/artifactpoisoning92.yml:28:9:29:6 | Uses Step | semmle.label | Uses Step |
 | .github/workflows/artifactpoisoning92.yml:29:14:29:26 | make snapshot | semmle.label | make snapshot |
-| .github/workflows/artifactpoisoning96.yml:13:9:18:6 | Uses Step | semmle.label | Uses Step |
-| .github/workflows/artifactpoisoning96.yml:18:14:18:24 | npm install | semmle.label | npm install |
 | .github/workflows/artifactpoisoning101.yml:10:9:16:6 | Uses Step | semmle.label | Uses Step |
 | .github/workflows/artifactpoisoning101.yml:17:14:19:59 | PR_NUMBER=$(./get_pull_request_number.sh pr_number.txt)\necho "PR_NUMBER=$PR_NUMBER" >> $GITHUB_OUTPUT \n | semmle.label | PR_NUMBER=$(./get_pull_request_number.sh pr_number.txt)\necho "PR_NUMBER=$PR_NUMBER" >> $GITHUB_OUTPUT \n |
 | .github/workflows/test18.yml:12:15:33:12 | Uses Step | semmle.label | Uses Step |
@@ -69,7 +66,6 @@ subpaths
 | .github/workflows/artifactpoisoning81.yml:31:14:31:27 | python test.py | .github/workflows/artifactpoisoning81.yml:28:9:31:6 | Uses Step | .github/workflows/artifactpoisoning81.yml:31:14:31:27 | python test.py | Potential artifact poisoning in $@, which may be controlled by an external user ($@). | .github/workflows/artifactpoisoning81.yml:31:14:31:27 | python test.py | python test.py | .github/workflows/artifactpoisoning81.yml:3:5:3:23 | pull_request_target | pull_request_target |
 | .github/workflows/artifactpoisoning92.yml:28:9:29:6 | Uses Step | .github/actions/download-artifact-2/action.yaml:6:7:25:4 | Uses Step | .github/workflows/artifactpoisoning92.yml:28:9:29:6 | Uses Step | Potential artifact poisoning in $@, which may be controlled by an external user ($@). | .github/workflows/artifactpoisoning92.yml:28:9:29:6 | Uses Step | Uses Step | .github/workflows/artifactpoisoning92.yml:3:3:3:14 | workflow_run | workflow_run |
 | .github/workflows/artifactpoisoning92.yml:29:14:29:26 | make snapshot | .github/actions/download-artifact-2/action.yaml:6:7:25:4 | Uses Step | .github/workflows/artifactpoisoning92.yml:29:14:29:26 | make snapshot | Potential artifact poisoning in $@, which may be controlled by an external user ($@). | .github/workflows/artifactpoisoning92.yml:29:14:29:26 | make snapshot | make snapshot | .github/workflows/artifactpoisoning92.yml:3:3:3:14 | workflow_run | workflow_run |
-| .github/workflows/artifactpoisoning96.yml:18:14:18:24 | npm install | .github/workflows/artifactpoisoning96.yml:13:9:18:6 | Uses Step | .github/workflows/artifactpoisoning96.yml:18:14:18:24 | npm install | Potential artifact poisoning in $@, which may be controlled by an external user ($@). | .github/workflows/artifactpoisoning96.yml:18:14:18:24 | npm install | npm install | .github/workflows/artifactpoisoning96.yml:2:3:2:14 | workflow_run | workflow_run |
 | .github/workflows/artifactpoisoning101.yml:17:14:19:59 | PR_NUMBER=$(./get_pull_request_number.sh pr_number.txt)\necho "PR_NUMBER=$PR_NUMBER" >> $GITHUB_OUTPUT \n | .github/workflows/artifactpoisoning101.yml:10:9:16:6 | Uses Step | .github/workflows/artifactpoisoning101.yml:17:14:19:59 | PR_NUMBER=$(./get_pull_request_number.sh pr_number.txt)\necho "PR_NUMBER=$PR_NUMBER" >> $GITHUB_OUTPUT \n | Potential artifact poisoning in $@, which may be controlled by an external user ($@). | .github/workflows/artifactpoisoning101.yml:17:14:19:59 | PR_NUMBER=$(./get_pull_request_number.sh pr_number.txt)\necho "PR_NUMBER=$PR_NUMBER" >> $GITHUB_OUTPUT \n | PR_NUMBER=$(./get_pull_request_number.sh pr_number.txt)\necho "PR_NUMBER=$PR_NUMBER" >> $GITHUB_OUTPUT \n | .github/workflows/artifactpoisoning101.yml:4:3:4:21 | pull_request_target | pull_request_target |
 | .github/workflows/test18.yml:36:15:40:58 | Uses Step | .github/workflows/test18.yml:12:15:33:12 | Uses Step | .github/workflows/test18.yml:36:15:40:58 | Uses Step | Potential artifact poisoning in $@, which may be controlled by an external user ($@). | .github/workflows/test18.yml:36:15:40:58 | Uses Step | Uses Step | .github/workflows/test18.yml:3:5:3:16 | workflow_run | workflow_run |
 | .github/workflows/test25.yml:39:14:40:45 | ./gradlew buildScanPublishPrevious\n | .github/workflows/test25.yml:22:9:32:6 | Uses Step: downloadBuildScan | .github/workflows/test25.yml:39:14:40:45 | ./gradlew buildScanPublishPrevious\n | Potential artifact poisoning in $@, which may be controlled by an external user ($@). | .github/workflows/test25.yml:39:14:40:45 | ./gradlew buildScanPublishPrevious\n | ./gradlew buildScanPublishPrevious\n | .github/workflows/test25.yml:2:3:2:14 | workflow_run | workflow_run |
--- a/actions/ql/test/query-tests/Security/CWE-829/ArtifactPoisoningMedium.expected
+++ b/actions/ql/test/query-tests/Security/CWE-829/ArtifactPoisoningMedium.expected
@@ -13,7 +13,6 @@ edges
 | .github/workflows/artifactpoisoning42.yml:13:9:21:6 | Run Step | .github/workflows/artifactpoisoning42.yml:22:14:22:18 | ./cmd | provenance | Config |
 | .github/workflows/artifactpoisoning71.yml:9:9:16:6 | Uses Step | .github/workflows/artifactpoisoning71.yml:17:14:18:40 | sed -f config foo.md > bar.md\n | provenance | Config |
 | .github/workflows/artifactpoisoning81.yml:28:9:31:6 | Uses Step | .github/workflows/artifactpoisoning81.yml:31:14:31:27 | python test.py | provenance | Config |
-| .github/workflows/artifactpoisoning96.yml:13:9:18:6 | Uses Step | .github/workflows/artifactpoisoning96.yml:18:14:18:24 | npm install | provenance | Config |
 | .github/workflows/artifactpoisoning101.yml:10:9:16:6 | Uses Step | .github/workflows/artifactpoisoning101.yml:17:14:19:59 | PR_NUMBER=$(./get_pull_request_number.sh pr_number.txt)\necho "PR_NUMBER=$PR_NUMBER" >> $GITHUB_OUTPUT \n | provenance | Config |
 | .github/workflows/test18.yml:12:15:33:12 | Uses Step | .github/workflows/test18.yml:36:15:40:58 | Uses Step | provenance | Config |
 | .github/workflows/test25.yml:22:9:32:6 | Uses Step: downloadBuildScan | .github/workflows/test25.yml:39:14:40:45 | ./gradlew buildScanPublishPrevious\n | provenance | Config |
@@ -45,8 +44,6 @@ nodes
 | .github/workflows/artifactpoisoning81.yml:31:14:31:27 | python test.py | semmle.label | python test.py |
 | .github/workflows/artifactpoisoning92.yml:28:9:29:6 | Uses Step | semmle.label | Uses Step |
 | .github/workflows/artifactpoisoning92.yml:29:14:29:26 | make snapshot | semmle.label | make snapshot |
-| .github/workflows/artifactpoisoning96.yml:13:9:18:6 | Uses Step | semmle.label | Uses Step |
-| .github/workflows/artifactpoisoning96.yml:18:14:18:24 | npm install | semmle.label | npm install |
 | .github/workflows/artifactpoisoning101.yml:10:9:16:6 | Uses Step | semmle.label | Uses Step |
 | .github/workflows/artifactpoisoning101.yml:17:14:19:59 | PR_NUMBER=$(./get_pull_request_number.sh pr_number.txt)\necho "PR_NUMBER=$PR_NUMBER" >> $GITHUB_OUTPUT \n | semmle.label | PR_NUMBER=$(./get_pull_request_number.sh pr_number.txt)\necho "PR_NUMBER=$PR_NUMBER" >> $GITHUB_OUTPUT \n |
 | .github/workflows/test18.yml:12:15:33:12 | Uses Step | semmle.label | Uses Step |
--- a/actions/ql/test/query-tests/Security/CWE-829/UntrustedCheckoutCritical.expected
+++ b/actions/ql/test/query-tests/Security/CWE-829/UntrustedCheckoutCritical.expected
@@ -51,16 +51,6 @@ edges
 | .github/workflows/artifactpoisoning92.yml:19:9:25:6 | Run Step: metadata | .github/workflows/artifactpoisoning92.yml:25:9:28:6 | Uses Step |
 | .github/workflows/artifactpoisoning92.yml:25:9:28:6 | Uses Step | .github/workflows/artifactpoisoning92.yml:28:9:29:6 | Uses Step |
 | .github/workflows/artifactpoisoning92.yml:28:9:29:6 | Uses Step | .github/workflows/artifactpoisoning92.yml:29:9:29:27 | Run Step |
-| .github/workflows/artifactpoisoning93.yml:12:9:13:6 | Uses Step | .github/workflows/artifactpoisoning93.yml:13:9:19:6 | Uses Step |
-| .github/workflows/artifactpoisoning93.yml:13:9:19:6 | Uses Step | .github/workflows/artifactpoisoning93.yml:19:9:19:24 | Run Step |
-| .github/workflows/artifactpoisoning94.yml:12:9:13:6 | Uses Step | .github/workflows/artifactpoisoning94.yml:13:9:19:6 | Uses Step |
-| .github/workflows/artifactpoisoning94.yml:13:9:19:6 | Uses Step | .github/workflows/artifactpoisoning94.yml:19:9:19:24 | Run Step |
-| .github/workflows/artifactpoisoning95.yml:12:9:13:6 | Uses Step | .github/workflows/artifactpoisoning95.yml:13:9:19:6 | Uses Step |
-| .github/workflows/artifactpoisoning95.yml:13:9:19:6 | Uses Step | .github/workflows/artifactpoisoning95.yml:19:9:19:24 | Run Step |
-| .github/workflows/artifactpoisoning96.yml:12:9:13:6 | Uses Step | .github/workflows/artifactpoisoning96.yml:13:9:18:6 | Uses Step |
-| .github/workflows/artifactpoisoning96.yml:13:9:18:6 | Uses Step | .github/workflows/artifactpoisoning96.yml:18:9:18:24 | Run Step |
-| .github/workflows/artifactpoisoning97.yml:12:9:13:6 | Uses Step | .github/workflows/artifactpoisoning97.yml:13:9:19:6 | Uses Step |
-| .github/workflows/artifactpoisoning97.yml:13:9:19:6 | Uses Step | .github/workflows/artifactpoisoning97.yml:19:9:19:25 | Run Step |
 | .github/workflows/artifactpoisoning101.yml:10:9:16:6 | Uses Step | .github/workflows/artifactpoisoning101.yml:16:9:19:59 | Run Step: pr_number |
 | .github/workflows/auto_ci.yml:20:9:27:6 | Uses Step | .github/workflows/auto_ci.yml:27:9:32:6 | Uses Step |
 | .github/workflows/auto_ci.yml:27:9:32:6 | Uses Step | .github/workflows/auto_ci.yml:32:9:37:6 | Run Step |
--- a/config/identical-files.json
+++ b/config/identical-files.json
@@ -231,10 +231,35 @@
    "java/ql/src/experimental/Security/CWE/CWE-400/LocalThreadResourceAbuse.qhelp",
    "java/ql/src/experimental/Security/CWE/CWE-400/ThreadResourceAbuse.qhelp"
  ],
+  "CryptoAlgorithms Python/JS/Ruby": [
+    "javascript/ql/lib/semmle/javascript/security/CryptoAlgorithms.qll",
+    "python/ql/lib/semmle/python/concepts/CryptoAlgorithms.qll",
+    "ruby/ql/lib/codeql/ruby/security/CryptoAlgorithms.qll",
+    "rust/ql/lib/codeql/rust/security/CryptoAlgorithms.qll"
+  ],
+  "CryptoAlgorithmNames Python/JS/Ruby": [
+    "javascript/ql/lib/semmle/javascript/security/internal/CryptoAlgorithmNames.qll",
+    "python/ql/lib/semmle/python/concepts/internal/CryptoAlgorithmNames.qll",
+    "ruby/ql/lib/codeql/ruby/security/internal/CryptoAlgorithmNames.qll",
+    "rust/ql/lib/codeql/rust/security/internal/CryptoAlgorithmNames.qll"
+  ],
+  "SensitiveDataHeuristics Python/JS": [
+    "javascript/ql/lib/semmle/javascript/security/internal/SensitiveDataHeuristics.qll",
+    "python/ql/lib/semmle/python/security/internal/SensitiveDataHeuristics.qll",
+    "ruby/ql/lib/codeql/ruby/security/internal/SensitiveDataHeuristics.qll",
+    "swift/ql/lib/codeql/swift/security/internal/SensitiveDataHeuristics.qll",
+    "rust/ql/lib/codeql/rust/security/internal/SensitiveDataHeuristics.qll"
+  ],
  "IncompleteUrlSubstringSanitization": [
    "javascript/ql/src/Security/CWE-020/IncompleteUrlSubstringSanitization.qll",
    "ruby/ql/src/queries/security/cwe-020/IncompleteUrlSubstringSanitization.qll"
  ],
+  "Concepts Python/Ruby/JS": [
+    "python/ql/lib/semmle/python/internal/ConceptsShared.qll",
+    "ruby/ql/lib/codeql/ruby/internal/ConceptsShared.qll",
+    "javascript/ql/lib/semmle/javascript/internal/ConceptsShared.qll",
+    "rust/ql/lib/codeql/rust/internal/ConceptsShared.qll"
+  ],
  "ApiGraphModels": [
    "javascript/ql/lib/semmle/javascript/frameworks/data/internal/ApiGraphModels.qll",
    "ruby/ql/lib/codeql/ruby/frameworks/data/internal/ApiGraphModels.qll",
--- a/cpp/bulk_generation_targets.yml
+++ b/cpp/bulk_generation_targets.yml
@@ -2,9 +2,6 @@ language: cpp
 strategy: dca
 destination: cpp/ql/lib/ext/generated
 targets:
- name: glibc
-  with-sinks: false
-  with-sources: false
 - name: zlib
  with-sinks: false
  with-sources: false
--- a/cpp/ql/lib/CHANGELOG.md
+++ b/cpp/ql/lib/CHANGELOG.md
@@ -1,30 +1,3 @@
-## 5.4.0
-
-### New Features
-
-* Exposed various SSA-related classes (`Definition`, `PhiNode`, `ExplicitDefinition`, `DirectExplicitDefinition`, and `IndirectExplicitDefinition`) which were previously only usable inside the internal dataflow directory.
-
-### Minor Analysis Improvements
-
-* The `cpp/overrun-write` query now recognizes more bound checks and thus produces fewer false positives.
-
-## 5.3.0
-
-### Deprecated APIs
-
-* The `UnknownDefaultLocation`, `UnknownExprLocation`, and `UnknownStmtLocation` classes have been deprecated. Use `UnknownLocation` instead.
-
-### New Features
-
-* Added a `isFinalValueOfParameter` predicate to `DataFlow::Node` which holds when a dataflow node represents the final value of an output parameter of a function.
-
-### Minor Analysis Improvements
-
-* The `FunctionWithWrappers` library (`semmle.code.cpp.security.FunctionWithWrappers`) no longer considers calls through function pointers as wrapper functions.
-* The analysis of C/C++ code targeting 64-bit Arm platforms has been improved. This includes support for the Arm-specific builtin functions, support for the `arm_neon.h` header and Neon vector types, and support for the `fp8` scalar type. The `arm_sve.h` header and scalable vectors are only partially supported at this point.
-* Added support for `__fp16 _Complex` and `__bf16 _Complex` types
-* Added `sql-injection` sink models for the Oracle Call Interface (OCI) database library functions `OCIStmtPrepare` and `OCIStmtPrepare2`.
-
 ## 5.2.0

 ### Deprecated APIs
--- a/cpp/ql/lib/change-notes/2025-06-20-oracle-oci-models.md
+++ b/cpp/ql/lib/change-notes/2025-06-20-oracle-oci-models.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Added `sql-injection` sink models for the Oracle Call Interface (OCI) database library functions `OCIStmtPrepare` and `OCIStmtPrepare2`.
--- a/cpp/ql/lib/change-notes/2025-06-24-float16
+++ b/cpp/ql/lib/change-notes/2025-06-24-float16
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The analysis of C/C++ code targeting 64-bit Arm platforms has been improved. This includes support for the Arm-specific builtin functions, support for the `arm_neon.h` header and Neon vector types, and support for the `fp8` scalar type. The `arm_sve.h` header and scalable vectors are only partially supported at this point.
--- a/cpp/ql/lib/change-notes/2025-06-24-float16.md
+++ b/cpp/ql/lib/change-notes/2025-06-24-float16.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Added support for `__fp16 _Complex` and `__bf16 _Complex` types
--- a/cpp/ql/lib/change-notes/2025-06-27-locations.md
+++ b/cpp/ql/lib/change-notes/2025-06-27-locations.md
@@ -0,0 +1,4 @@
+---
+category: deprecated
+---
+* The `UnknownDefaultLocation`, `UnknownExprLocation`, and `UnknownStmtLocation` classes have been deprecated. Use `UnknownLocation` instead.
--- a/cpp/ql/lib/change-notes/released/5.3.0.md
+++ b/cpp/ql/lib/change-notes/released/5.3.0.md
@@ -1,16 +0,0 @@
-## 5.3.0
-
-### Deprecated APIs
-
-* The `UnknownDefaultLocation`, `UnknownExprLocation`, and `UnknownStmtLocation` classes have been deprecated. Use `UnknownLocation` instead.
-
-### New Features
-
-* Added a `isFinalValueOfParameter` predicate to `DataFlow::Node` which holds when a dataflow node represents the final value of an output parameter of a function.
-
-### Minor Analysis Improvements
-
-* The `FunctionWithWrappers` library (`semmle.code.cpp.security.FunctionWithWrappers`) no longer considers calls through function pointers as wrapper functions.
-* The analysis of C/C++ code targeting 64-bit Arm platforms has been improved. This includes support for the Arm-specific builtin functions, support for the `arm_neon.h` header and Neon vector types, and support for the `fp8` scalar type. The `arm_sve.h` header and scalable vectors are only partially supported at this point.
-* Added support for `__fp16 _Complex` and `__bf16 _Complex` types
-* Added `sql-injection` sink models for the Oracle Call Interface (OCI) database library functions `OCIStmtPrepare` and `OCIStmtPrepare2`.
--- a/cpp/ql/lib/change-notes/released/5.4.0.md
+++ b/cpp/ql/lib/change-notes/released/5.4.0.md
@@ -1,9 +0,0 @@
-## 5.4.0
-
-### New Features
-
-* Exposed various SSA-related classes (`Definition`, `PhiNode`, `ExplicitDefinition`, `DirectExplicitDefinition`, and `IndirectExplicitDefinition`) which were previously only usable inside the internal dataflow directory.
-
-### Minor Analysis Improvements
-
-* The `cpp/overrun-write` query now recognizes more bound checks and thus produces fewer false positives.
--- a/cpp/ql/lib/codeql-pack.release.yml
+++ b/cpp/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 5.4.0
+lastReleaseVersion: 5.2.0
--- a/cpp/ql/lib/ext/Windows.model.yml
+++ b/cpp/ql/lib/ext/Windows.model.yml
@@ -32,18 +32,4 @@ extensions:
      - ["", "", False, "CommandLineToArgvA", "", "", "Argument[*0]", "ReturnValue[**]", "taint", "manual"]
      - ["", "", False, "CommandLineToArgvW", "", "", "Argument[*0]", "ReturnValue[**]", "taint", "manual"]
      # fileapi.h
-      - ["", "", False, "ReadFileEx", "", "", "Argument[*3].Field[@hEvent]", "Argument[4].Parameter[*2].Field[@hEvent]", "value", "manual"]
-      # processthreadsapi.h
-      - ["", "", False, "CreateThread", "", "", "Argument[@3]", "Argument[2].Parameter[@0]", "value", "manual"]
-      - ["", "", False, "CreateRemoteThread", "", "", "Argument[@4]", "Argument[3].Parameter[@0]", "value", "manual"]
-      - ["", "", False, "CreateRemoteThreadEx", "", "", "Argument[@4]", "Argument[3].Parameter[@0]", "value", "manual"]
-      # wdm.h
-      - ["", "", False, "RtlCopyVolatileMemory", "", "", "Argument[*@1]", "Argument[*@0]", "value", "manual"]
-      - ["", "", False, "RtlCopyDeviceMemory", "", "", "Argument[*@1]", "Argument[*@0]", "value", "manual"]
-      - ["", "", False, "RtlCopyMemory", "", "", "Argument[*@1]", "Argument[*@0]", "value", "manual"]
-      - ["", "", False, "RtlCopyMemoryNonTemporal", "", "", "Argument[*@1]", "Argument[*@0]", "value", "manual"]
-      - ["", "", False, "RtlCopyUnicodeString", "", "", "Argument[*1].Field[*Buffer]", "Argument[*0].Field[*Buffer]", "value", "manual"]
-      - ["", "", False, "RtlMoveMemory", "", "", "Argument[*@1]", "Argument[*@0]", "value", "manual"]
-      - ["", "", False, "RtlMoveVolatileMemory", "", "", "Argument[*@1]", "Argument[*@0]", "value", "manual"]
-      # winternl.h
-      - ["", "", False, "RtlInitUnicodeString", "", "", "Argument[*1]", "Argument[*0].Field[*Buffer]", "value", "manual"]
+      - ["", "", False, "ReadFileEx", "", "", "Argument[*3].Field[@hEvent]", "Argument[4].Parameter[*2].Field[@hEvent]", "value", "manual"]
--- a/cpp/ql/lib/ext/generated/glibc/glibc.model.yml
+++ b/cpp/ql/lib/ext/generated/glibc/glibc.model.yml
--- a/cpp/ql/lib/ext/pthread.model.yml
+++ b/cpp/ql/lib/ext/pthread.model.yml
@@ -1,6 +0,0 @@
-extensions:
-  - addsTo:
-      pack: codeql/cpp-all
-      extensible: summaryModel
-    data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
-      - ["", "", False, "pthread_create", "", "", "Argument[@3]", "Argument[2].Parameter[@0]", "value", "manual"]
--- a/cpp/ql/lib/ext/std.thread.model.yml
+++ b/cpp/ql/lib/ext/std.thread.model.yml
@@ -1,11 +0,0 @@
-extensions:
-  - addsTo:
-      pack: codeql/cpp-all
-      extensible: summaryModel
-    data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
-      - ["std", "thread", True, "thread", "", "", "Argument[*@1]", "Argument[0].Parameter[@0]", "value", "manual"]
-      - ["std", "thread", True, "thread", "", "", "Argument[*@2]", "Argument[0].Parameter[@1]", "value", "manual"]
-      - ["std", "thread", True, "thread", "", "", "Argument[*@3]", "Argument[0].Parameter[@2]", "value", "manual"]
-      - ["std", "thread", True, "thread", "", "", "Argument[*@4]", "Argument[0].Parameter[@3]", "value", "manual"]
-      - ["std", "thread", True, "thread", "", "", "Argument[*@5]", "Argument[0].Parameter[@4]", "value", "manual"]
-      
--- a/cpp/ql/lib/qlpack.yml
+++ b/cpp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-all
-version: 5.4.0
+version: 5.2.1-dev
 groups: cpp
 dbscheme: semmlecode.cpp.dbscheme
 extractor: cpp
--- a/cpp/ql/lib/semmle/code/cpp/Concept.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Concept.qll
@@ -57,9 +57,7 @@ class RequiresExpr extends Expr, @requires_expr {
 /**
 * A C++ requirement in a requires expression.
 */
-class RequirementExpr extends Expr {
-  RequirementExpr() { this.getParent() instanceof RequiresExpr }
-}
+class RequirementExpr extends Expr { }

 /**
 * A C++ simple requirement in a requires expression.
@@ -72,6 +70,7 @@ class RequirementExpr extends Expr {
 */
 class SimpleRequirementExpr extends RequirementExpr {
  SimpleRequirementExpr() {
+    this.getParent() instanceof RequiresExpr and
    not this instanceof TypeRequirementExpr and
    not this instanceof CompoundRequirementExpr and
    not this instanceof NestedRequirementExpr
@@ -90,6 +89,8 @@ class SimpleRequirementExpr extends RequirementExpr {
 * with `T` a template parameter, then `typename T::a_field;` is a type requirement.
 */
 class TypeRequirementExpr extends RequirementExpr, TypeName {
+  TypeRequirementExpr() { this.getParent() instanceof RequiresExpr }
+
  override string getAPrimaryQlClass() { result = "TypeRequirementExpr" }
 }

@@ -139,7 +140,7 @@ class CompoundRequirementExpr extends RequirementExpr, @compound_requirement {
 * with `T` a template parameter, then `requires std::is_same<T, int>::value;` is
 * a nested requirement.
 */
-class NestedRequirementExpr extends RequirementExpr, @nested_requirement {
+class NestedRequirementExpr extends Expr, @nested_requirement {
  override string toString() { result = "requires ..." }

  override string getAPrimaryQlClass() { result = "NestedRequirementExpr" }
@@ -162,7 +163,7 @@ class NestedRequirementExpr extends RequirementExpr, @nested_requirement {
 * then `C<int, 1>` is a concept id expression that refers to
 * the concept `C`.
 */
-class ConceptIdExpr extends Expr, @concept_id {
+class ConceptIdExpr extends RequirementExpr, @concept_id {
  override string toString() {
    result = this.getConcept().getName() + "<...>"
    or
--- a/cpp/ql/lib/semmle/code/cpp/controlflow/SSA.qll
+++ b/cpp/ql/lib/semmle/code/cpp/controlflow/SSA.qll
@@ -15,13 +15,6 @@ class StandardSsa extends SsaHelper {
 }

 /**
- * NOTE: If possible, prefer the SSA classes exposed by the new dataflow
- * library:
- * ```
- * import semmle.code.cpp.dataflow.new.DataFlow
- * // use `DataFlow::Ssa::Definition`
- * ```
- *
 * A definition of one or more SSA variables, including phi node definitions.
 * An _SSA variable_, as defined in the literature, is effectively the pair of
 * an `SsaDefinition d` and a `StackVariable v`, written `(d, v)` in this
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowDispatch.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowDispatch.qll
@@ -1,5 +1,6 @@
 private import cpp
 private import semmle.code.cpp.ir.IR
+private import semmle.code.cpp.ir.dataflow.DataFlow
 private import DataFlowPrivate
 private import DataFlowUtil
 private import DataFlowImplCommon as DataFlowImplCommon
@@ -59,7 +60,7 @@ private module VirtualDispatch {
     * `resolve` predicate to stitch that information together and resolve the
     * call.
     */
-    abstract Node getDispatchValue();
+    abstract DataFlow::Node getDispatchValue();

    /** Gets a candidate target for this call. */
    abstract Function resolve();
@@ -71,13 +72,17 @@ private module VirtualDispatch {
     * parameter is true when the search is allowed to continue backwards into
     * a parameter; non-recursive callers should pass `_` for `allowFromArg`.
     */
-    predicate flowsFrom(Node src, boolean allowFromArg) {
+    predicate flowsFrom(DataFlow::Node src, boolean allowFromArg) {
      src = this.getDispatchValue() and allowFromArg = true
      or
-      exists(Node other, boolean allowOtherFromArg | this.flowsFrom(other, allowOtherFromArg) |
+      exists(DataFlow::Node other, boolean allowOtherFromArg |
+        this.flowsFrom(other, allowOtherFromArg)
+      |
        // Call argument
        exists(DataFlowCall call, Position i |
-          other.(ParameterNode).isParameterOf(pragma[only_bind_into](call).getStaticCallTarget(), i) and
+          other
+              .(DataFlow::ParameterNode)
+              .isParameterOf(pragma[only_bind_into](call).getStaticCallTarget(), i) and
          src.(ArgumentNode).argumentOf(call, pragma[only_bind_into](pragma[only_bind_out](i)))
        ) and
        allowOtherFromArg = true and
@@ -91,7 +96,7 @@ private module VirtualDispatch {
        allowFromArg = false
        or
        // Local flow
-        localFlowStep(src, other) and
+        DataFlow::localFlowStep(src, other) and
        allowFromArg = allowOtherFromArg
        or
        // Flow from global variable to load.
@@ -154,11 +159,11 @@ private module VirtualDispatch {
  private class DataSensitiveExprCall extends DataSensitiveCall {
    DataSensitiveExprCall() { not exists(this.getStaticCallTarget()) }

-    override Node getDispatchValue() { result.asOperand() = this.getCallTargetOperand() }
+    override DataFlow::Node getDispatchValue() { result.asOperand() = this.getCallTargetOperand() }

    override Function resolve() {
      exists(FunctionInstruction fi |
-        this.flowsFrom(instructionNode(fi), _) and
+        this.flowsFrom(DataFlow::instructionNode(fi), _) and
        result = fi.getFunctionSymbol()
      ) and
      (
@@ -181,7 +186,7 @@ private module VirtualDispatch {
      )
    }

-    override Node getDispatchValue() { result.asInstruction() = this.getArgument(-1) }
+    override DataFlow::Node getDispatchValue() { result.asInstruction() = this.getArgument(-1) }

    override MemberFunction resolve() {
      exists(Class overridingClass |
@@ -208,7 +213,7 @@ private module VirtualDispatch {
    pragma[noinline]
    private predicate hasFlowFromCastFrom(Class derivedClass) {
      exists(ConvertToBaseInstruction toBase |
-        this.flowsFrom(instructionNode(toBase), _) and
+        this.flowsFrom(DataFlow::instructionNode(toBase), _) and
        derivedClass = toBase.getDerivedClass()
      )
    }
@@ -265,7 +270,7 @@ private predicate mayBenefitFromCallContext(
  exists(InitializeParameterInstruction init |
    not exists(call.getStaticCallTarget()) and
    init.getEnclosingFunction() = f.getUnderlyingCallable() and
-    call.flowsFrom(instructionNode(init), _) and
+    call.flowsFrom(DataFlow::instructionNode(init), _) and
    init.getParameter().getIndex() = arg
  )
 }
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll
@@ -4,7 +4,7 @@ private import semmle.code.cpp.ir.IR
 private import DataFlowDispatch
 private import semmle.code.cpp.ir.internal.IRCppLanguage
 private import semmle.code.cpp.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
-private import SsaImpl as Ssa
+private import SsaInternals as Ssa
 private import DataFlowImplCommon as DataFlowImplCommon
 private import codeql.util.Unit
 private import Node0ToString
@@ -1382,89 +1382,16 @@ predicate neverSkipInPathGraph(Node n) {
  exists(n.asIndirectDefinition())
 }

-private newtype TLambdaCallKind =
-  TFunctionPointer() or
-  TFunctor()
-
-class LambdaCallKind extends TLambdaCallKind {
-  predicate isFunctionPointer() { this = TFunctionPointer() }
-
-  predicate isFunctor() { this = TFunctor() }
-
-  string toString() {
-    this.isFunctionPointer() and
-    result = "Function pointer kind"
-    or
-    this.isFunctor() and
-    result = "Functor kind"
-  }
-}
-
-private class ConstructorCallInstruction extends CallInstruction {
-  Cpp::Class constructedType;
-
-  ConstructorCallInstruction() {
-    this.getStaticCallTarget().(Cpp::Constructor).getDeclaringType() = constructedType
-  }
-
-  Cpp::Class getConstructedType() { result = constructedType }
-}
-
-private class OperatorCall extends Cpp::MemberFunction {
-  OperatorCall() { this.hasName("operator()") }
-}
-
-private predicate isFunctorCreationWithoutConstructor(Node creation, OperatorCall operator) {
-  exists(UninitializedInstruction init, Instruction dest |
-    // A construction of an object with no constructor. In this case we use
-    // the `UninitializedInstruction` as the creation node.
-    init = creation.asInstruction() and
-    dest = init.getDestinationAddress() and
-    not any(ConstructorCallInstruction constructorCall).getThisArgument() = dest and
-    operator.getDeclaringType() = init.getResultType()
-  )
-  or
-  // Workaround for an extractor bug. In this snippet:
-  // ```
-  // struct S { };
-  // void f(S);
-  // f(S());
-  // ```
-  // The expression `S()` is represented as a 0 literal in the database.
-  exists(ConstantValueInstruction constant |
-    constant.getValue() = "0" and
-    creation.asInstruction() = constant and
-    constant.getResultType() = operator.getDeclaringType()
-  )
-}
-
-private predicate isFunctorCreationWithConstructor(Node creation, OperatorCall operator) {
-  exists(DataFlowCall constructorCall, IndirectionPosition pos |
-    // A construction of an object with a constructor. In this case we use
-    // the post-update node of the qualifier
-    pos.getArgumentIndex() = -1 and
-    isArgumentNode(creation.(PostUpdateNode).getPreUpdateNode(), constructorCall, pos) and
-    operator.getDeclaringType() =
-      constructorCall.asCallInstruction().(ConstructorCallInstruction).getConstructedType()
-  )
-}
+class LambdaCallKind = Unit;

 /** Holds if `creation` is an expression that creates a lambda of kind `kind` for `c`. */
 predicate lambdaCreation(Node creation, LambdaCallKind kind, DataFlowCallable c) {
-  kind.isFunctionPointer() and
-  creation.asInstruction().(FunctionAddressInstruction).getFunctionSymbol() = c.asSourceCallable()
-  or
-  kind.isFunctor() and
-  exists(OperatorCall operator | operator = c.asSourceCallable() |
-    isFunctorCreationWithoutConstructor(creation, operator)
-    or
-    isFunctorCreationWithConstructor(creation, operator)
-  )
+  creation.asInstruction().(FunctionAddressInstruction).getFunctionSymbol() = c.asSourceCallable() and
+  exists(kind)
 }

 /** Holds if `call` is a lambda call of kind `kind` where `receiver` is the lambda expression. */
 predicate lambdaCall(DataFlowCall call, LambdaCallKind kind, Node receiver) {
-  kind.isFunctionPointer() and
  (
    call.(SummaryCall).getReceiver() = receiver.(FlowSummaryNode).getSummaryNode()
    or
@@ -1473,15 +1400,8 @@ predicate lambdaCall(DataFlowCall call, LambdaCallKind kind, Node receiver) {
    // has a result for `getStaticCallTarget`.
    not exists(call.getStaticCallTarget()) and
    call.asCallInstruction().getCallTargetOperand() = receiver.asOperand()
-  )
-  or
-  kind.isFunctor() and
-  (
-    call.(SummaryCall).getReceiver() = receiver.(FlowSummaryNode).getSummaryNode()
-    or
-    not exists(call.getStaticCallTarget()) and
-    call.asCallInstruction().getThisArgumentOperand() = receiver.asOperand()
-  )
+  ) and
+  exists(kind)
 }

 /** Extra data-flow steps needed for lambda flow analysis. */
@@ -1982,23 +1902,19 @@ module IteratorFlow {

    predicate allowFlowIntoUncertainDef(IteratorSsa::UncertainWriteDefinition def) { any() }

-    class GuardValue = Void;
-
    class Guard extends Void {
-      predicate hasValueBranchEdge(
-        SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, GuardValue val
-      ) {
+      predicate hasBranchEdge(SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, boolean branch) {
        none()
      }

-      predicate valueControlsBranchEdge(
-        SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, GuardValue val
+      predicate controlsBranchEdge(
+        SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, boolean branch
      ) {
        none()
      }
    }

-    predicate guardDirectlyControlsBlock(Guard guard, SsaInput::BasicBlock bb, GuardValue val) {
+    predicate guardDirectlyControlsBlock(Guard guard, SsaInput::BasicBlock bb, boolean branch) {
      none()
    }

--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll
@@ -13,7 +13,7 @@ private import semmle.code.cpp.models.interfaces.DataFlow
 private import semmle.code.cpp.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
 private import DataFlowPrivate
 private import ModelUtil
-private import SsaImpl as SsaImpl
+private import SsaInternals as Ssa
 private import DataFlowImplCommon as DataFlowImplCommon
 private import codeql.util.Unit
 private import Node0ToString
@@ -39,39 +39,38 @@ private newtype TIRDataFlowNode =
  TNode0(Node0Impl node) { DataFlowImplCommon::forceCachingInSameStage() } or
  TGlobalLikeVariableNode(GlobalLikeVariable var, int indirectionIndex) {
    indirectionIndex =
-      [getMinIndirectionsForType(var.getUnspecifiedType()) .. SsaImpl::getMaxIndirectionsForType(var.getUnspecifiedType())]
+      [getMinIndirectionsForType(var.getUnspecifiedType()) .. Ssa::getMaxIndirectionsForType(var.getUnspecifiedType())]
  } or
  TPostUpdateNodeImpl(Operand operand, int indirectionIndex) {
    operand = any(FieldAddress fa).getObjectAddressOperand() and
-    indirectionIndex =
-      [0 .. SsaImpl::countIndirectionsForCppType(SsaImpl::getLanguageType(operand))]
+    indirectionIndex = [0 .. Ssa::countIndirectionsForCppType(Ssa::getLanguageType(operand))]
    or
-    SsaImpl::isModifiableByCall(operand, indirectionIndex)
+    Ssa::isModifiableByCall(operand, indirectionIndex)
  } or
-  TSsaSynthNode(SsaImpl::SynthNode n) or
+  TSsaSynthNode(Ssa::SynthNode n) or
  TSsaIteratorNode(IteratorFlow::IteratorFlowNode n) or
  TRawIndirectOperand0(Node0Impl node, int indirectionIndex) {
-    SsaImpl::hasRawIndirectOperand(node.asOperand(), indirectionIndex)
+    Ssa::hasRawIndirectOperand(node.asOperand(), indirectionIndex)
  } or
  TRawIndirectInstruction0(Node0Impl node, int indirectionIndex) {
    not exists(node.asOperand()) and
-    SsaImpl::hasRawIndirectInstruction(node.asInstruction(), indirectionIndex)
+    Ssa::hasRawIndirectInstruction(node.asInstruction(), indirectionIndex)
  } or
  TFinalParameterNode(Parameter p, int indirectionIndex) {
-    exists(SsaImpl::FinalParameterUse use |
+    exists(Ssa::FinalParameterUse use |
      use.getParameter() = p and
      use.getIndirectionIndex() = indirectionIndex
    )
  } or
-  TFinalGlobalValue(SsaImpl::GlobalUse globalUse) or
-  TInitialGlobalValue(SsaImpl::GlobalDef globalUse) or
+  TFinalGlobalValue(Ssa::GlobalUse globalUse) or
+  TInitialGlobalValue(Ssa::GlobalDef globalUse) or
  TBodyLessParameterNodeImpl(Parameter p, int indirectionIndex) {
    // Rule out parameters of catch blocks.
    not exists(p.getCatchBlock()) and
    // We subtract one because `getMaxIndirectionsForType` returns the maximum
    // indirection for a glvalue of a given type, and this doesn't apply to
    // parameters.
-    indirectionIndex = [0 .. SsaImpl::getMaxIndirectionsForType(p.getUnspecifiedType()) - 1] and
+    indirectionIndex = [0 .. Ssa::getMaxIndirectionsForType(p.getUnspecifiedType()) - 1] and
    not any(InitializeParameterInstruction init).getParameter() = p
  } or
  TFlowSummaryNode(FlowSummaryImpl::Private::SummaryNode sn)
@@ -82,7 +81,7 @@ private newtype TIRDataFlowNode =
 class FieldAddress extends Operand {
  FieldAddressInstruction fai;

-  FieldAddress() { fai = this.getDef() and not SsaImpl::ignoreOperand(this) }
+  FieldAddress() { fai = this.getDef() and not Ssa::ignoreOperand(this) }

  /** Gets the field associated with this instruction. */
  Field getField() { result = fai.getField() }
@@ -127,7 +126,7 @@ predicate conversionFlow(
    )
    or
    additional = true and
-    SsaImpl::isAdditionalConversionFlow(opFrom, instrTo)
+    Ssa::isAdditionalConversionFlow(opFrom, instrTo)
  )
  or
  isPointerArith = true and
@@ -184,7 +183,7 @@ class Node extends TIRDataFlowNode {
    or
    this.asOperand().getUse() = block.getInstruction(i)
    or
-    exists(SsaImpl::SynthNode ssaNode |
+    exists(Ssa::SynthNode ssaNode |
      this.(SsaSynthNode).getSynthNode() = ssaNode and
      ssaNode.getBasicBlock() = block and
      ssaNode.getIndex() = i
@@ -365,10 +364,10 @@ class Node extends TIRDataFlowNode {
   * pointed to by `p`.
   */
  Expr asDefinition(boolean uncertain) {
-    exists(StoreInstruction store, SsaImpl::Definition def |
+    exists(StoreInstruction store, Ssa::Definition def |
      store = this.asInstruction() and
      result = asDefinitionImpl(store) and
-      SsaImpl::defToNode(this, def, _) and
+      Ssa::defToNode(this, def, _) and
      if def.isCertain() then uncertain = false else uncertain = true
    )
  }
@@ -489,23 +488,6 @@ class Node extends TIRDataFlowNode {
    result = this.(IndirectParameterNode).getParameter()
  }

-  /**
-   * Holds if this node represents the `indirectionIndex`'th indirection of
-   * the value of an output parameter `p` just before reaching the end of a function.
-   */
-  predicate isFinalValueOfParameter(Parameter p, int indirectionIndex) {
-    exists(FinalParameterNode n | n = this |
-      p = n.getParameter() and
-      indirectionIndex = n.getIndirectionIndex()
-    )
-  }
-
-  /**
-   * Holds if this node represents the value of an output parameter `p`
-   * just before reaching the end of a function.
-   */
-  predicate isFinalValueOfParameter(Parameter p) { this.isFinalValueOfParameter(p, _) }
-
  /**
   * Gets the variable corresponding to this node, if any. This can be used for
   * modeling flow in and out of global variables.
@@ -628,7 +610,7 @@ class OperandNode extends Node, Node0 {
 * For example, `stripPointers(int*&)` is `int*` and `stripPointers(int*)` is `int`.
 */
 Type stripPointer(Type t) {
-  result = any(SsaImpl::Indirection ind | ind.getType() = t).getBaseType()
+  result = any(Ssa::Indirection ind | ind.getType() = t).getBaseType()
  or
  result = t.(PointerToMemberType).getBaseType()
  or
@@ -695,12 +677,12 @@ class PostFieldUpdateNode extends PostUpdateNodeImpl {
 * in a data flow graph.
 */
 class SsaSynthNode extends Node, TSsaSynthNode {
-  SsaImpl::SynthNode node;
+  Ssa::SynthNode node;

  SsaSynthNode() { this = TSsaSynthNode(node) }

  /** Gets the synthesized SSA node associated with this node. */
-  SsaImpl::SynthNode getSynthNode() { result = node }
+  Ssa::SynthNode getSynthNode() { result = node }

  override DataFlowCallable getEnclosingCallable() {
    result.asSourceCallable() = this.getFunction()
@@ -783,12 +765,12 @@ class SideEffectOperandNode extends Node instanceof IndirectOperand {
 * from a function body.
 */
 class FinalGlobalValue extends Node, TFinalGlobalValue {
-  SsaImpl::GlobalUse globalUse;
+  Ssa::GlobalUse globalUse;

  FinalGlobalValue() { this = TFinalGlobalValue(globalUse) }

  /** Gets the underlying SSA use. */
-  SsaImpl::GlobalUse getGlobalUse() { result = globalUse }
+  Ssa::GlobalUse getGlobalUse() { result = globalUse }

  override DataFlowCallable getEnclosingCallable() {
    result.asSourceCallable() = this.getFunction()
@@ -815,12 +797,12 @@ class FinalGlobalValue extends Node, TFinalGlobalValue {
 * a function body.
 */
 class InitialGlobalValue extends Node, TInitialGlobalValue {
-  SsaImpl::GlobalDef globalDef;
+  Ssa::GlobalDef globalDef;

  InitialGlobalValue() { this = TInitialGlobalValue(globalDef) }

  /** Gets the underlying SSA definition. */
-  SsaImpl::GlobalDef getGlobalDef() { result = globalDef }
+  Ssa::GlobalDef getGlobalDef() { result = globalDef }

  override DataFlowCallable getEnclosingCallable() {
    result.asSourceCallable() = this.getFunction()
@@ -1243,7 +1225,7 @@ import RawIndirectNodes
 /**
 * INTERNAL: do not use.
 *
- * A node representing the value of an output parameter
+ * A node representing the value of an update parameter
 * just before reaching the end of a function.
 */
 class FinalParameterNode extends Node, TFinalParameterNode {
@@ -1289,11 +1271,11 @@ class UninitializedNode extends Node {
  LocalVariable v;

  UninitializedNode() {
-    exists(SsaImpl::Definition def, SsaImpl::SourceVariable sv |
+    exists(Ssa::Definition def, Ssa::SourceVariable sv |
      def.getIndirectionIndex() = 0 and
      def.getValue().asInstruction() instanceof UninitializedInstruction and
-      SsaImpl::defToNode(this, def, sv) and
-      v = sv.getBaseVariable().(SsaImpl::BaseIRVariable).getIRVariable().getAst()
+      Ssa::defToNode(this, def, sv) and
+      v = sv.getBaseVariable().(Ssa::BaseIRVariable).getIRVariable().getAst()
    )
  }

@@ -1723,7 +1705,7 @@ private module Cached {
  cached
  predicate flowsToBackEdge(Node n) {
    exists(Node succ, IRBlock bb1, IRBlock bb2 |
-      SsaImpl::ssaFlow(n, succ) and
+      Ssa::ssaFlow(n, succ) and
      bb1 = n.getBasicBlock() and
      bb2 = succ.getBasicBlock() and
      bb1 != bb2 and
@@ -1821,7 +1803,7 @@ private module Cached {
  predicate simpleLocalFlowStep(Node nodeFrom, Node nodeTo, string model) {
    (
      // Def-use/Use-use flow
-      SsaImpl::ssaFlow(nodeFrom, nodeTo)
+      Ssa::ssaFlow(nodeFrom, nodeTo)
      or
      IteratorFlow::localFlowStep(nodeFrom, nodeTo)
      or
@@ -1834,7 +1816,7 @@ private module Cached {
      |
        simpleOperandLocalFlowStep(iFrom, opTo) and
        // Omit when the instruction node also represents the operand.
-        not iFrom = SsaImpl::getIRRepresentationOfOperand(opTo)
+        not iFrom = Ssa::getIRRepresentationOfOperand(opTo)
      )
      or
      // Indirect operand -> (indirect) instruction flow
@@ -1907,7 +1889,7 @@ private module Cached {
      // We also want a write coming out of an `OutNode` to flow `nodeTo`.
      // This is different from `reverseFlowInstruction` since `nodeFrom` can never
      // be an `OutNode` when it's defined by an instruction.
-      SsaImpl::outNodeHasAddressAndIndex(nodeFrom, address, indirectionIndex)
+      Ssa::outNodeHasAddressAndIndex(nodeFrom, address, indirectionIndex)
    )
  }

@@ -2100,7 +2082,7 @@ private newtype TContent =
  TFieldContent(Field f, int indirectionIndex) {
    // the indirection index for field content starts at 1 (because `TFieldContent` is thought of as
    // the address of the field, `FieldAddress` in the IR).
-    indirectionIndex = [1 .. SsaImpl::getMaxIndirectionsForType(f.getUnspecifiedType())] and
+    indirectionIndex = [1 .. Ssa::getMaxIndirectionsForType(f.getUnspecifiedType())] and
    // Reads and writes of union fields are tracked using `UnionContent`.
    not f.getDeclaringType() instanceof Union
  } or
@@ -2112,9 +2094,7 @@ private newtype TContent =
      // field can be read by any read of the union's fields. Again, the indirection index
      // is 1-based (because 0 is considered the address).
      indirectionIndex =
-        [1 .. max(SsaImpl::getMaxIndirectionsForType(getAFieldWithSize(u, bytes)
-                    .getUnspecifiedType())
-          )]
+        [1 .. max(Ssa::getMaxIndirectionsForType(getAFieldWithSize(u, bytes).getUnspecifiedType()))]
    )
  } or
  TElementContent(int indirectionIndex) {
@@ -2357,7 +2337,7 @@ module BarrierGuard<guardChecksSig/3 guardChecks> {
      controls(g, result, edge)
    )
    or
-    result = SsaImpl::BarrierGuard<guardChecksNode/3>::getABarrierNode()
+    result = Ssa::BarrierGuard<guardChecksNode/3>::getABarrierNode()
  }

  /**
@@ -2456,7 +2436,7 @@ module BarrierGuard<guardChecksSig/3 guardChecks> {
    )
    or
    result =
-      SsaImpl::BarrierGuardWithIntParam<guardChecksIndirectNode/4>::getABarrierNode(indirectionIndex)
+      Ssa::BarrierGuardWithIntParam<guardChecksIndirectNode/4>::getABarrierNode(indirectionIndex)
  }
 }

@@ -2493,7 +2473,7 @@ module InstructionBarrierGuard<instructionGuardChecksSig/3 instructionGuardCheck
      controls(g, result, edge)
    )
    or
-    result = SsaImpl::BarrierGuard<guardChecksNode/3>::getABarrierNode()
+    result = Ssa::BarrierGuard<guardChecksNode/3>::getABarrierNode()
  }

  bindingset[value, n]
@@ -2523,7 +2503,7 @@ module InstructionBarrierGuard<instructionGuardChecksSig/3 instructionGuardCheck
    )
    or
    result =
-      SsaImpl::BarrierGuardWithIntParam<guardChecksIndirectNode/4>::getABarrierNode(indirectionIndex)
+      Ssa::BarrierGuardWithIntParam<guardChecksIndirectNode/4>::getABarrierNode(indirectionIndex)
  }
 }

@@ -2579,16 +2559,3 @@ Function getARuntimeTarget(Call call) {
    result = DataFlowImplCommon::viableCallableLambda(dfCall, _).asSourceCallable()
  )
 }
-
-/** A module that provides static single assignment (SSA) information. */
-module Ssa {
-  class Definition = SsaImpl::Definition;
-
-  class ExplicitDefinition = SsaImpl::ExplicitDefinition;
-
-  class DirectExplicitDefinition = SsaImpl::DirectExplicitDefinition;
-
-  class IndirectExplicitDefinition = SsaImpl::IndirectExplicitDefinition;
-
-  class PhiNode = SsaImpl::PhiNode;
-}
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/ExprNodes.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/ExprNodes.qll
@@ -151,7 +151,7 @@ private module Cached {
    )
    or
    // Similarly for `i++` and `++i` we pretend that the generated
-    // `StoreInstruction` contains the result of the expression even though
+    // `StoreInstruction` is contains the result of the expression even though
    // this isn't totally aligned with the C/C++ standard.
    exists(TranslatedCrementOperation tco |
      store = tco.getInstruction(CrementStoreTag()) and
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/ModelUtil.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/ModelUtil.qll
@@ -4,15 +4,15 @@
 */

 private import semmle.code.cpp.ir.IR
-private import semmle.code.cpp.models.interfaces.FunctionInputsAndOutputs
+private import semmle.code.cpp.ir.dataflow.DataFlow
 private import DataFlowUtil
 private import DataFlowPrivate
-private import SsaImpl as Ssa
+private import SsaInternals as Ssa

 /**
 * Gets the instruction that goes into `input` for `call`.
 */
-Node callInput(CallInstruction call, FunctionInput input) {
+DataFlow::Node callInput(CallInstruction call, FunctionInput input) {
  // An argument or qualifier
  exists(int index |
    result.asOperand() = call.getArgumentOperand(index) and
@@ -62,8 +62,8 @@ Node callOutput(CallInstruction call, FunctionOutput output) {
  result = callOutputWithIndirectionIndex(call, output, _)
 }

-Node callInput(CallInstruction call, FunctionInput input, int d) {
-  exists(Node n | n = callInput(call, input) and d > 0 |
+DataFlow::Node callInput(CallInstruction call, FunctionInput input, int d) {
+  exists(DataFlow::Node n | n = callInput(call, input) and d > 0 |
    // An argument or qualifier
    hasOperandAndIndex(result, n.asOperand(), d)
    or
@@ -85,7 +85,7 @@ private IndirectReturnOutNode getIndirectReturnOutNode(CallInstruction call, int
 */
 bindingset[d]
 Node callOutput(CallInstruction call, FunctionOutput output, int d) {
-  exists(Node n, int indirectionIndex |
+  exists(DataFlow::Node n, int indirectionIndex |
    n = callOutputWithIndirectionIndex(call, output, indirectionIndex) and d > 0
  |
    // The return value
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/PrintDataFlowRelevantIR.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/PrintDataFlowRelevantIR.qll
@@ -1,6 +1,6 @@
 private import cpp
 private import semmle.code.cpp.ir.IR
-private import SsaImpl as Ssa
+private import SsaInternals as Ssa

 /**
 * A property provider that hides all instructions and operands that are not relevant for IR dataflow.
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/PrintIRLocalFlow.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/PrintIRLocalFlow.qll
@@ -2,7 +2,7 @@ private import cpp
 private import semmle.code.cpp.ir.IR
 private import semmle.code.cpp.ir.dataflow.internal.DataFlowUtil
 private import semmle.code.cpp.ir.dataflow.internal.DataFlowPrivate
-private import SsaImpl as Ssa
+private import SsaInternals as Ssa
 private import PrintIRUtilities

 /**
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternals.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternals.qll
@@ -1,4 +1,4 @@
-private import codeql.ssa.Ssa as Ssa
+private import codeql.ssa.Ssa as SsaImplCommon
 private import semmle.code.cpp.ir.IR
 private import DataFlowUtil
 private import DataFlowImplCommon as DataFlowImplCommon
@@ -12,7 +12,7 @@ private import semmle.code.cpp.ir.internal.IRCppLanguage
 private import semmle.code.cpp.ir.dataflow.internal.ModelUtil
 private import semmle.code.cpp.ir.implementation.raw.internal.TranslatedInitialization
 private import DataFlowPrivate
-import SsaImplCommon
+import SsaInternalsCommon

 private module SourceVariables {
  cached
@@ -153,10 +153,6 @@ private predicate isGlobalDefImpl(
  GlobalLikeVariable v, IRFunction f, int indirection, int indirectionIndex
 ) {
  exists(VariableAddressInstruction vai |
-    // The right-hand side of an initialization of a global variable
-    // creates its own `IRFunction`. We don't want flow into that `IRFunction`
-    // since the variable is only initialized once.
-    not vai.getEnclosingFunction() = v and
    vai.getEnclosingIRFunction() = f and
    vai.getAstVariable() = v and
    isUse(_, _, vai, indirection, indirectionIndex) and
@@ -884,7 +880,7 @@ private predicate baseSourceVariableIsGlobal(
  )
 }

-private module SsaInput implements Ssa::InputSig<Location> {
+private module SsaInput implements SsaImplCommon::InputSig<Location> {
  import InputSigCommon
  import SourceVariables

@@ -958,11 +954,9 @@ class GlobalDef extends Definition {
  GlobalLikeVariable getVariable() { result = impl.getVariable() }
 }

-private module SsaImpl = Ssa::Make<Location, SsaInput>;
+private module SsaImpl = SsaImplCommon::Make<Location, SsaInput>;

 private module DataFlowIntegrationInput implements SsaImpl::DataFlowIntegrationInputSig {
-  private import codeql.util.Boolean
-
  class Expr extends Instruction {
    Expr() {
      exists(IRBlock bb, int i |
@@ -994,14 +988,10 @@ private module DataFlowIntegrationInput implements SsaImpl::DataFlowIntegrationI
    result instanceof FalseEdge
  }

-  class GuardValue = Boolean;
-
  class Guard instanceof IRGuards::IRGuardCondition {
    string toString() { result = super.toString() }

-    predicate hasValueBranchEdge(
-      SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, GuardValue branch
-    ) {
+    predicate hasBranchEdge(SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, boolean branch) {
      exists(EdgeKind kind |
        super.getBlock() = bb1 and
        kind = getConditionalEdge(branch) and
@@ -1009,14 +999,12 @@ private module DataFlowIntegrationInput implements SsaImpl::DataFlowIntegrationI
      )
    }

-    predicate valueControlsBranchEdge(
-      SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, GuardValue branch
-    ) {
-      this.hasValueBranchEdge(bb1, bb2, branch)
+    predicate controlsBranchEdge(SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, boolean branch) {
+      this.hasBranchEdge(bb1, bb2, branch)
    }
  }

-  predicate guardDirectlyControlsBlock(Guard guard, SsaInput::BasicBlock bb, GuardValue branch) {
+  predicate guardDirectlyControlsBlock(Guard guard, SsaInput::BasicBlock bb, boolean branch) {
    guard.(IRGuards::IRGuardCondition).controls(bb, branch)
  }

@@ -1045,8 +1033,7 @@ module BarrierGuardWithIntParam<guardChecksNodeSig/4 guardChecksNode> {
  }

  private predicate guardChecks(
-    DataFlowIntegrationInput::Guard g, SsaImpl::Definition def,
-    DataFlowIntegrationInput::GuardValue branch, int indirectionIndex
+    DataFlowIntegrationInput::Guard g, SsaImpl::Definition def, boolean branch, int indirectionIndex
  ) {
    exists(UseImpl use |
      guardChecksNode(g, use.getNode(), branch, indirectionIndex) and
@@ -1125,11 +1112,9 @@ class PhiNode extends Definition instanceof SsaImpl::PhiNode {

 /** An static single assignment (SSA) definition. */
 class Definition extends SsaImpl::Definition {
-  private Definition getAPhiInputOrPriorDefinition() {
-    result = this.(PhiNode).getAnInput()
-    or
-    SsaImpl::uncertainWriteDefinitionInput(this, result)
-  }
+  // TODO: Include prior definitions of uncertain writes or rename predicate
+  // i.e. the disjunct `SsaImpl::uncertainWriteDefinitionInput(this, result)`
+  private Definition getAPhiInputOrPriorDefinition() { result = this.(PhiNode).getAnInput() }

  /**
   * Gets a definition that ultimately defines this SSA definition and is
@@ -1140,36 +1125,6 @@ class Definition extends SsaImpl::Definition {
    not result instanceof PhiNode
  }

-  /** Gets an `Operand` that represents a use of this definition. */
-  Operand getAUse() {
-    exists(SourceVariable sv, IRBlock bb, int i, UseImpl use |
-      ssaDefReachesRead(sv, this, bb, i) and
-      use.hasIndexInBlock(bb, i, sv) and
-      result = use.getNode().asOperand()
-    )
-  }
-
-  /**
-   * Gets an `Operand` that represents an indirect use of this definition.
-   *
-   * The use is indirect because the operand represents a pointer that points
-   * to the value written by this definition. For example in:
-   * ```cpp
-   * 1. int x = 42;
-   * 2. int* p = &x;
-   * ```
-   * There is an `ExplicitDefinition` corresponding to `x = 42` on line 1 and
-   * the definition has an indirect use on line 2 because `&x` points to the
-   * value that was defined by the definition.
-   */
-  Operand getAnIndirectUse(int indirectionIndex) {
-    exists(SourceVariable sv, IRBlock bb, int i, UseImpl use |
-      ssaDefReachesRead(sv, this, bb, i) and
-      use.hasIndexInBlock(bb, i, sv) and
-      result = use.getNode().asIndirectOperand(indirectionIndex)
-    )
-  }
-
  /**
   * INTERNAL: Do not use.
   */
@@ -1202,63 +1157,4 @@ class Definition extends SsaImpl::Definition {
  Type getUnspecifiedType() { result = this.getUnderlyingType().getUnspecifiedType() }
 }

-/**
- * An SSA definition that corresponds to an explicit definition.
- */
-class ExplicitDefinition extends Definition, SsaImpl::WriteDefinition {
-  DefImpl def;
-
-  ExplicitDefinition() {
-    exists(IRBlock bb, int i, SourceVariable sv |
-      this.definesAt(sv, bb, i) and
-      def.hasIndexInBlock(sv, bb, i)
-    )
-  }
-
-  /**
-   * Gets the `Instruction` computing the value that is written to the
-   * associated SSA variable by this SSA definition.
-   *
-   * If `this.getIndirectionIndex() = 0` (i.e., if `this` is an instance of
-   * `DirectExplicitDefinition`) then the SSA variable is present in the source
-   * code.
-   * However, if `this.getIndirectionIndex() > 0` (i.e., if `this` is an
-   * instance of `IndirectExplicitDefinition`) then the SSA variable associated
-   * with this definition represents the memory pointed to by a variable in the
-   * source code.
-   */
-  Instruction getAssignedInstruction() { result = def.getValue().asInstruction() }
-}
-
-/**
- * An explicit SSA definition that writes an indirect value to a pointer.
- *
- * For example in:
- * ```cpp
- * int x = 42;  // (1)
- * int* p = &x; // (2)
- * ```
- * There are three `ExplicitDefinition`:
- * 1. A `DirectExplicitDefinition` at (1) which writes `42` to the SSA variable
- * corresponding to `x`.
- * 2. A `DirectExplicitDefinition` at (2) which writes `&x` to the SSA variable
- * corresponding to `p`.
- * 3. A `IndirectExplicitDefinition` at (2) which writes `*&x` (i.e., `x`) to
- * the SSA variable corresponding to `*p`.
- */
-class IndirectExplicitDefinition extends ExplicitDefinition {
-  IndirectExplicitDefinition() { this.getIndirectionIndex() > 0 }
-}
-
-/**
- * An SSA definition that corresponds to an explicit definition.
- *
- * Unlike `ExplicitDefinition` this class does not include indirect
- * explicit definition. See `IndirectExplicitDefinition` if you want to include
- * those.
- */
-class DirectExplicitDefinition extends ExplicitDefinition {
-  DirectExplicitDefinition() { this.getIndirectionIndex() = 0 }
-}
-
 import SsaCached
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternalsCommon.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternalsCommon.qll
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TaintTrackingUtil.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TaintTrackingUtil.qll
@@ -5,7 +5,7 @@ private import semmle.code.cpp.models.interfaces.DataFlow
 private import semmle.code.cpp.models.interfaces.SideEffect
 private import DataFlowUtil
 private import DataFlowPrivate
-private import SsaImpl as Ssa
+private import SsaInternals as Ssa
 private import semmle.code.cpp.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
 private import semmle.code.cpp.ir.dataflow.FlowSteps

--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/Opcode.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/Opcode.qll
@@ -42,7 +42,6 @@ private newtype TOpcode =
  TCompareGT() or
  TCompareLE() or
  TCompareGE() or
-  TSpaceship() or
  TPointerAdd() or
  TPointerSub() or
  TPointerDiff() or
@@ -93,9 +92,7 @@ private newtype TOpcode =
  TUninitializedGroup() or
  TInlineAsm() or
  TUnreached() or
-  TNewObj() or
-  TTypeidExpr() or
-  TTypeidType()
+  TNewObj()

 /**
 * An opcode that specifies the operation performed by an `Instruction`.
@@ -766,15 +763,6 @@ module Opcode {
    final override string toString() { result = "CompareGE" }
  }

-  /**
-   * The `Opcode` for a `SpaceshipInstruction`.
-   *
-   * See the `SpaceshipInstruction` documentation for more details.
-   */
-  class Spaceship extends BinaryOpcode, TSpaceship {
-    final override string toString() { result = "Spaceship" }
-  }
-
  /**
   * The `Opcode` for a `PointerAddInstruction`.
   *
@@ -1293,29 +1281,4 @@ module Opcode {
  class NewObj extends Opcode, TNewObj {
    final override string toString() { result = "NewObj" }
  }
-
-  /**
-   * The `Opcode` for a `TypeidInstruction`.
-   *
-   * See the `TypeidInstruction` documentation for more details.
-   */
-  abstract class Typeid extends Opcode { }
-
-  /**
-   * The `Opcode` for a `TypeidExprInstruction`.
-   *
-   * See the `TypeidExprInstruction` documentation for more details.
-   */
-  class TypeidExpr extends Typeid, UnaryOpcode, TTypeidExpr {
-    final override string toString() { result = "TypeidExpr" }
-  }
-
-  /**
-   * The `Opcode` for a `TypeidTypeInstruction`.
-   *
-   * See the `TypeidTypeInstruction` documentation for more details.
-   */
-  class TypeidType extends Typeid, TTypeidType {
-    final override string toString() { result = "TypeidType" }
-  }
 }
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/Instruction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/Instruction.qll
@@ -725,20 +725,6 @@ class UninitializedInstruction extends VariableInstruction {
   * Gets the variable that is uninitialized.
   */
  final Language::Variable getLocalVariable() { result = var.(IRUserVariable).getVariable() }
-
-  /**
-   * Gets the operand that provides the address of the location to which the
-   * uninitialized value will be stored.
-   */
-  final AddressOperand getDestinationAddressOperand() { result = this.getAnOperand() }
-
-  /**
-   * Gets the instruction whose result provides the address of the location to
-   * which the value will be stored, if an exact definition is available.
-   */
-  final Instruction getDestinationAddress() {
-    result = this.getDestinationAddressOperand().getDef()
-  }
 }

 /**
@@ -1604,13 +1590,6 @@ class CompareGEInstruction extends RelationalInstruction {
  override predicate isStrict() { none() }
 }

-/**
- * An instruction that represents a three-way comparison operator.
- */
-class SpaceshipInstruction extends BinaryInstruction {
-  SpaceshipInstruction() { this.getOpcode() instanceof Opcode::Spaceship }
-}
-
 /**
 * An instruction that branches to one of multiple successor instructions based on the value of an
 * integer operand.
@@ -2300,26 +2279,3 @@ class NextVarArgInstruction extends UnaryInstruction {
 class NewObjInstruction extends Instruction {
  NewObjInstruction() { this.getOpcode() instanceof Opcode::NewObj }
 }
-
-/**
- * An instruction that returns the type info for its operand.
- */
-class TypeidInstruction extends Instruction {
-  TypeidInstruction() { this.getOpcode() instanceof Opcode::Typeid }
-}
-
-/**
- * An instruction that returns the type info for its operand, where the
- * operand occurs as an expression in the AST.
- */
-class TypeidExprInstruction extends TypeidInstruction, UnaryInstruction {
-  TypeidExprInstruction() { this.getOpcode() instanceof Opcode::TypeidExpr }
-}
-
-/**
- * An instruction that returns the type info for its operand, where the
- * operand occurs as a type in the AST.
- */
-class TypeidTypeInstruction extends TypeidInstruction {
-  TypeidTypeInstruction() { this.getOpcode() instanceof Opcode::TypeidType }
-}
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/Instruction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/Instruction.qll
@@ -725,20 +725,6 @@ class UninitializedInstruction extends VariableInstruction {
   * Gets the variable that is uninitialized.
   */
  final Language::Variable getLocalVariable() { result = var.(IRUserVariable).getVariable() }
-
-  /**
-   * Gets the operand that provides the address of the location to which the
-   * uninitialized value will be stored.
-   */
-  final AddressOperand getDestinationAddressOperand() { result = this.getAnOperand() }
-
-  /**
-   * Gets the instruction whose result provides the address of the location to
-   * which the value will be stored, if an exact definition is available.
-   */
-  final Instruction getDestinationAddress() {
-    result = this.getDestinationAddressOperand().getDef()
-  }
 }

 /**
@@ -1604,13 +1590,6 @@ class CompareGEInstruction extends RelationalInstruction {
  override predicate isStrict() { none() }
 }

-/**
- * An instruction that represents a three-way comparison operator.
- */
-class SpaceshipInstruction extends BinaryInstruction {
-  SpaceshipInstruction() { this.getOpcode() instanceof Opcode::Spaceship }
-}
-
 /**
 * An instruction that branches to one of multiple successor instructions based on the value of an
 * integer operand.
@@ -2300,26 +2279,3 @@ class NextVarArgInstruction extends UnaryInstruction {
 class NewObjInstruction extends Instruction {
  NewObjInstruction() { this.getOpcode() instanceof Opcode::NewObj }
 }
-
-/**
- * An instruction that returns the type info for its operand.
- */
-class TypeidInstruction extends Instruction {
-  TypeidInstruction() { this.getOpcode() instanceof Opcode::Typeid }
-}
-
-/**
- * An instruction that returns the type info for its operand, where the
- * operand occurs as an expression in the AST.
- */
-class TypeidExprInstruction extends TypeidInstruction, UnaryInstruction {
-  TypeidExprInstruction() { this.getOpcode() instanceof Opcode::TypeidExpr }
-}
-
-/**
- * An instruction that returns the type info for its operand, where the
- * operand occurs as a type in the AST.
- */
-class TypeidTypeInstruction extends TypeidInstruction {
-  TypeidTypeInstruction() { this.getOpcode() instanceof Opcode::TypeidType }
-}
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedExpr.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedExpr.qll
@@ -1808,11 +1808,6 @@ private Opcode comparisonOpcode(ComparisonOperation expr) {
  expr instanceof GEExpr and result instanceof Opcode::CompareGE
 }

-private Opcode spaceShipOpcode(SpaceshipExpr expr) {
-  exists(expr) and
-  result instanceof Opcode::Spaceship
-}
-
 /**
 * IR translation of a simple binary operation.
 */
@@ -1872,8 +1867,7 @@ class TranslatedBinaryOperation extends TranslatedSingleInstructionExpr {
  override Opcode getOpcode() {
    result = binaryArithmeticOpcode(expr) or
    result = binaryBitwiseOpcode(expr) or
-    result = comparisonOpcode(expr) or
-    result = spaceShipOpcode(expr)
+    result = comparisonOpcode(expr)
  }

  override Type getExprType() {
@@ -4152,8 +4146,7 @@ predicate exprNeedsCopyIfNotLoaded(Expr expr) {
 private predicate exprImmediatelyDiscarded(Expr expr) {
  exists(ExprStmt s |
    s = expr.getParent() and
-    not exists(StmtExpr se | s = se.getStmt().(BlockStmt).getLastStmt()) and
-    not exists(expr.getConversion())
+    not exists(StmtExpr se | s = se.getStmt().(BlockStmt).getLastStmt())
  )
  or
  exists(CommaExpr c | c.getLeftOperand() = expr)
@@ -4191,52 +4184,3 @@ class TranslatedAssumeExpr extends TranslatedSingleInstructionExpr {
    none()
  }
 }
-
-class TranslatedTypeidExpr extends TranslatedSingleInstructionExpr {
-  override TypeidOperator expr;
-
-  final override Opcode getOpcode() {
-    exists(this.getOperand()) and
-    result instanceof Opcode::TypeidExpr
-    or
-    not exists(this.getOperand()) and
-    result instanceof Opcode::TypeidType
-  }
-
-  final override Instruction getFirstInstruction(EdgeKind kind) {
-    result = this.getOperand().getFirstInstruction(kind)
-    or
-    not exists(this.getOperand()) and
-    result = this.getInstruction(OnlyInstructionTag()) and
-    kind instanceof GotoEdge
-  }
-
-  override Instruction getALastInstructionInternal() {
-    result = this.getInstruction(OnlyInstructionTag())
-  }
-
-  final override TranslatedElement getChildInternal(int id) {
-    id = 0 and result = this.getOperand()
-  }
-
-  final override Instruction getInstructionSuccessorInternal(InstructionTag tag, EdgeKind kind) {
-    tag = OnlyInstructionTag() and
-    result = this.getParent().getChildSuccessor(this, kind)
-  }
-
-  final override Instruction getChildSuccessorInternal(TranslatedElement child, EdgeKind kind) {
-    child = this.getOperand() and
-    result = this.getInstruction(OnlyInstructionTag()) and
-    kind instanceof GotoEdge
-  }
-
-  final override Instruction getInstructionRegisterOperand(InstructionTag tag, OperandTag operandTag) {
-    tag = OnlyInstructionTag() and
-    result = this.getOperand().getResult() and
-    operandTag instanceof UnaryOperandTag
-  }
-
-  private TranslatedExpr getOperand() {
-    result = getTranslatedExpr(expr.getExpr().getFullyConverted())
-  }
-}
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/Instruction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/Instruction.qll
@@ -725,20 +725,6 @@ class UninitializedInstruction extends VariableInstruction {
   * Gets the variable that is uninitialized.
   */
  final Language::Variable getLocalVariable() { result = var.(IRUserVariable).getVariable() }
-
-  /**
-   * Gets the operand that provides the address of the location to which the
-   * uninitialized value will be stored.
-   */
-  final AddressOperand getDestinationAddressOperand() { result = this.getAnOperand() }
-
-  /**
-   * Gets the instruction whose result provides the address of the location to
-   * which the value will be stored, if an exact definition is available.
-   */
-  final Instruction getDestinationAddress() {
-    result = this.getDestinationAddressOperand().getDef()
-  }
 }

 /**
@@ -1604,13 +1590,6 @@ class CompareGEInstruction extends RelationalInstruction {
  override predicate isStrict() { none() }
 }

-/**
- * An instruction that represents a three-way comparison operator.
- */
-class SpaceshipInstruction extends BinaryInstruction {
-  SpaceshipInstruction() { this.getOpcode() instanceof Opcode::Spaceship }
-}
-
 /**
 * An instruction that branches to one of multiple successor instructions based on the value of an
 * integer operand.
@@ -2300,26 +2279,3 @@ class NextVarArgInstruction extends UnaryInstruction {
 class NewObjInstruction extends Instruction {
  NewObjInstruction() { this.getOpcode() instanceof Opcode::NewObj }
 }
-
-/**
- * An instruction that returns the type info for its operand.
- */
-class TypeidInstruction extends Instruction {
-  TypeidInstruction() { this.getOpcode() instanceof Opcode::Typeid }
-}
-
-/**
- * An instruction that returns the type info for its operand, where the
- * operand occurs as an expression in the AST.
- */
-class TypeidExprInstruction extends TypeidInstruction, UnaryInstruction {
-  TypeidExprInstruction() { this.getOpcode() instanceof Opcode::TypeidExpr }
-}
-
-/**
- * An instruction that returns the type info for its operand, where the
- * operand occurs as a type in the AST.
- */
-class TypeidTypeInstruction extends TypeidInstruction {
-  TypeidTypeInstruction() { this.getOpcode() instanceof Opcode::TypeidType }
-}
--- a/cpp/ql/lib/semmle/code/cpp/security/FunctionWithWrappers.qll
+++ b/cpp/ql/lib/semmle/code/cpp/security/FunctionWithWrappers.qll
@@ -17,6 +17,7 @@

 import cpp
 import PrintfLike
+private import semmle.code.cpp.ir.dataflow.ResolveCall

 bindingset[index]
 private string toCause(Function func, int index) {
@@ -36,9 +37,9 @@ private predicate wrapperFunctionStep(
  not target.isVirtual() and
  not source.isVirtual() and
  source.hasDefinition() and
-  exists(FunctionCall call, Expr arg, Parameter sourceParam |
+  exists(Call call, Expr arg, Parameter sourceParam |
    // there is a 'call' to 'target' with argument 'arg' at index 'targetParamIndex'
-    target = call.getTarget() and
+    target = resolveCall(call) and
    arg = call.getArgument(targetParamIndex) and
    // 'call' is enclosed in 'source'
    source = call.getEnclosingFunction() and
@@ -153,8 +154,8 @@ abstract class FunctionWithWrappers extends Function {
   * Whether 'arg' is an argument in a call to an outermost wrapper function of 'this' function.
   */
  predicate outermostWrapperFunctionCall(Expr arg, string callChain) {
-    exists(Function targetFunc, FunctionCall call, int argIndex |
-      targetFunc = call.getTarget() and
+    exists(Function targetFunc, Call call, int argIndex |
+      targetFunc = resolveCall(call) and
      this.wrapperFunction(targetFunc, argIndex, callChain) and
      (
        exists(Function sourceFunc | sourceFunc = call.getEnclosingFunction() |
--- a/cpp/ql/lib/semmle/code/cpp/security/InvalidPointerDereference/AllocationToInvalidPointer.qll
+++ b/cpp/ql/lib/semmle/code/cpp/security/InvalidPointerDereference/AllocationToInvalidPointer.qll
@@ -53,12 +53,44 @@

 private import cpp
 private import semmle.code.cpp.ir.dataflow.internal.ProductFlow
-private import semmle.code.cpp.security.ProductFlowUtils.ProductFlowUtils
 private import semmle.code.cpp.ir.ValueNumbering
 private import semmle.code.cpp.controlflow.IRGuards
 private import codeql.util.Unit
 private import semmle.code.cpp.rangeanalysis.new.RangeAnalysisUtil

+private VariableAccess getAVariableAccess(Expr e) { e.getAChild*() = result }
+
+/**
+ * Gets a (sub)expression that may be the result of evaluating `size`.
+ *
+ * For example, `getASizeCandidate(a ? b : c)` gives `a ? b : c`, `b` and `c`.
+ */
+bindingset[size]
+pragma[inline_late]
+private Expr getASizeCandidate(Expr size) {
+  result = size
+  or
+  result = [size.(ConditionalExpr).getThen(), size.(ConditionalExpr).getElse()]
+}
+
+/**
+ * Holds if the `(n, state)` pair represents the source of flow for the size
+ * expression associated with `alloc`.
+ */
+predicate hasSize(HeuristicAllocationExpr alloc, DataFlow::Node n, int state) {
+  exists(VariableAccess va, Expr size, int delta, Expr s |
+    size = alloc.getSizeExpr() and
+    s = getASizeCandidate(size) and
+    // Get the unique variable in a size expression like `x` in `malloc(x + 1)`.
+    va = unique( | | getAVariableAccess(s)) and
+    // Compute `delta` as the constant difference between `x` and `x + 1`.
+    bounded1(any(Instruction instr | instr.getUnconvertedResultExpression() = s),
+      any(LoadInstruction load | load.getUnconvertedResultExpression() = va), delta) and
+    n.asExpr() = va and
+    state = delta
+  )
+}
+
 /**
 * Gets the virtual dispatch branching limit when calculating field flow while searching
 * for flow from an allocation to the construction of an out-of-bounds pointer.
@@ -68,6 +100,125 @@ private import semmle.code.cpp.rangeanalysis.new.RangeAnalysisUtil
 */
 int allocationToInvalidPointerFieldFlowBranchLimit() { result = 0 }

+/**
+ * A module that encapsulates a barrier guard to remove false positives from flow like:
+ * ```cpp
+ * char *p = new char[size];
+ * // ...
+ * unsigned n = size;
+ * // ...
+ * if(n < size) {
+ *   use(*p[n]);
+ * }
+ * ```
+ * In this case, the sink pair identified by the product flow library (without any additional barriers)
+ * would be `(p, n)` (where `n` is the `n` in `p[n]`), because there exists a pointer-arithmetic
+ * instruction `pai = a + b` such that:
+ * 1. the allocation flows to `a`, and
+ * 2. `b <= n` where `n` is the `n` in `p[n]`
+ * but because there's a strict comparison that compares `n` against the size of the allocation this
+ * snippet is fine.
+ */
+private module SizeBarrier {
+  private module SizeBarrierConfig implements DataFlow::ConfigSig {
+    predicate isSource(DataFlow::Node source) {
+      // The sources is the same as in the sources for the second
+      // projection in the `AllocToInvalidPointerConfig` module.
+      hasSize(_, source, _) and
+      InterestingPointerAddInstruction::isInterestingSize(source)
+    }
+
+    int fieldFlowBranchLimit() { result = allocationToInvalidPointerFieldFlowBranchLimit() }
+
+    /**
+     * Holds if `small <= large + k` holds if `g` evaluates to `testIsTrue`.
+     */
+    additional predicate isSink(
+      DataFlow::Node small, DataFlow::Node large, IRGuardCondition g, int k, boolean testIsTrue
+    ) {
+      // The sink is any "large" side of a relational comparison. i.e., the `large` expression
+      // in a guard such as `small <= large + k`.
+      g.comparesLt(small.asOperand(), large.asOperand(), k + 1, true, testIsTrue)
+    }
+
+    predicate isSink(DataFlow::Node sink) { isSink(_, sink, _, _, _) }
+  }
+
+  module SizeBarrierFlow = DataFlow::Global<SizeBarrierConfig>;
+
+  private int getASizeAddend(DataFlow::Node node) {
+    exists(DataFlow::Node source |
+      SizeBarrierFlow::flow(source, node) and
+      hasSize(_, source, result)
+    )
+  }
+
+  /**
+   * Holds if `small <= large + k` holds if `g` evaluates to `edge`.
+   */
+  private predicate operandGuardChecks(
+    IRGuardCondition g, Operand small, DataFlow::Node large, int k, boolean edge
+  ) {
+    SizeBarrierFlow::flowTo(large) and
+    SizeBarrierConfig::isSink(DataFlow::operandNode(small), large, g, k, edge)
+  }
+
+  /**
+   * Gets an instruction `instr` that is guarded by a check such as `instr <= small + delta` where
+   * `small <= _ + k` and `small` is the "small side" of of a relational comparison that checks
+   * whether `small <= size` where `size` is the size of an allocation.
+   */
+  Instruction getABarrierInstruction0(int delta, int k) {
+    exists(
+      IRGuardCondition g, ValueNumber value, Operand small, boolean edge, DataFlow::Node large
+    |
+      // We know:
+      // 1. result <= value + delta (by `bounded`)
+      // 2. value <= large + k (by `operandGuardChecks`).
+      // So:
+      // result <= value + delta (by 1.)
+      //        <= large + k + delta (by 2.)
+      small = value.getAUse() and
+      operandGuardChecks(pragma[only_bind_into](g), pragma[only_bind_into](small), large,
+        pragma[only_bind_into](k), pragma[only_bind_into](edge)) and
+      bounded(result, value.getAnInstruction(), delta) and
+      g.controls(result.getBlock(), edge) and
+      k < getASizeAddend(large)
+    )
+  }
+
+  /**
+   * Gets an instruction that is guarded by a guard condition which ensures that
+   * the value of the instruction is upper-bounded by size of some allocation.
+   */
+  bindingset[state]
+  pragma[inline_late]
+  Instruction getABarrierInstruction(int state) {
+    exists(int delta, int k |
+      state > k + delta and
+      // result <= "size of allocation" + delta + k
+      //        < "size of allocation" + state
+      result = getABarrierInstruction0(delta, k)
+    )
+  }
+
+  /**
+   * Gets a `DataFlow::Node` that is guarded by a guard condition which ensures that
+   * the value of the node is upper-bounded by size of some allocation.
+   */
+  DataFlow::Node getABarrierNode(int state) {
+    exists(DataFlow::Node source, int delta, int k |
+      SizeBarrierFlow::flow(source, result) and
+      hasSize(_, source, state) and
+      result.asInstruction() = SizeBarrier::getABarrierInstruction0(delta, k) and
+      state > k + delta
+      // so now we have:
+      // result <= "size of allocation" + delta + k
+      //        < "size of allocation" + state
+    )
+  }
+}
+
 private module InterestingPointerAddInstruction {
  private module PointerAddInstructionConfig implements DataFlow::ConfigSig {
    predicate isSource(DataFlow::Node source) {
@@ -76,7 +227,7 @@ private module InterestingPointerAddInstruction {
      hasSize(source.asExpr(), _, _)
    }

-    predicate fieldFlowBranchLimit = allocationToInvalidPointerFieldFlowBranchLimit/0;
+    int fieldFlowBranchLimit() { result = allocationToInvalidPointerFieldFlowBranchLimit() }

    predicate isSink(DataFlow::Node sink) {
      sink.asInstruction() = any(PointerAddInstruction pai).getLeft()
@@ -112,17 +263,6 @@ private module InterestingPointerAddInstruction {
  }
 }

-private module SizeBarrierInput implements SizeBarrierInputSig {
-  predicate fieldFlowBranchLimit = allocationToInvalidPointerFieldFlowBranchLimit/0;
-
-  predicate isSource(DataFlow::Node source) {
-    // The sources is the same as in the sources for the second
-    // projection in the `AllocToInvalidPointerConfig` module.
-    hasSize(_, source, _) and
-    InterestingPointerAddInstruction::isInterestingSize(source)
-  }
-}
-
 /**
 * A product-flow configuration for flow from an `(allocation, size)` pair to a
 * pointer-arithmetic operation `pai` such that `pai <= allocation + size`.
@@ -161,7 +301,7 @@ private module Config implements ProductFlow::StateConfigSig {
  private import semmle.code.cpp.ir.dataflow.internal.DataFlowPrivate

  predicate isBarrier2(DataFlow::Node node, FlowState2 state) {
-    node = SizeBarrier<SizeBarrierInput>::getABarrierNode(state)
+    node = SizeBarrier::getABarrierNode(state)
  }

  predicate isBarrier2(DataFlow::Node node) {
@@ -217,8 +357,8 @@ private predicate pointerAddInstructionHasBounds0(
    sizeInstr = sizeSink.asInstruction() and
    // pai.getRight() <= sizeSink + delta
    bounded1(right, sizeInstr, delta) and
-    not right = SizeBarrier<SizeBarrierInput>::getABarrierInstruction(delta) and
-    not sizeInstr = SizeBarrier<SizeBarrierInput>::getABarrierInstruction(delta)
+    not right = SizeBarrier::getABarrierInstruction(delta) and
+    not sizeInstr = SizeBarrier::getABarrierInstruction(delta)
  )
 }

--- a/cpp/ql/lib/semmle/code/cpp/security/ProductFlowUtils/ProductFlowUtils.qll
+++ b/cpp/ql/lib/semmle/code/cpp/security/ProductFlowUtils/ProductFlowUtils.qll
@@ -1,167 +0,0 @@
-/**
- * This file provides the `SizeBarrier` module which provides barriers for
- * both the `cpp/invalid-pointer-deref` query and the `cpp/overrun-write`
- * query.
- */
-
-private import cpp
-private import semmle.code.cpp.dataflow.new.DataFlow
-private import semmle.code.cpp.ir.ValueNumbering
-private import semmle.code.cpp.controlflow.IRGuards
-private import semmle.code.cpp.rangeanalysis.new.RangeAnalysisUtil
-
-private VariableAccess getAVariableAccess(Expr e) { e.getAChild*() = result }
-
-/**
- * Gets a (sub)expression that may be the result of evaluating `size`.
- *
- * For example, `getASizeCandidate(a ? b : c)` gives `a ? b : c`, `b` and `c`.
- */
-bindingset[size]
-pragma[inline_late]
-private Expr getASizeCandidate(Expr size) {
-  result = size
-  or
-  result = [size.(ConditionalExpr).getThen(), size.(ConditionalExpr).getElse()]
-}
-
-/**
- * Holds if the `(n, state)` pair represents the source of flow for the size
- * expression associated with `alloc`.
- */
-predicate hasSize(HeuristicAllocationExpr alloc, DataFlow::Node n, int state) {
-  exists(VariableAccess va, Expr size, int delta, Expr s |
-    size = alloc.getSizeExpr() and
-    s = getASizeCandidate(size) and
-    // Get the unique variable in a size expression like `x` in `malloc(x + 1)`.
-    va = unique( | | getAVariableAccess(s)) and
-    // Compute `delta` as the constant difference between `x` and `x + 1`.
-    bounded1(any(Instruction instr | instr.getUnconvertedResultExpression() = s),
-      any(LoadInstruction load | load.getUnconvertedResultExpression() = va), delta) and
-    n.asExpr() = va and
-    state = delta
-  )
-}
-
-/** Provides the input specification of the `SizeBarrier` module. */
-signature module SizeBarrierInputSig {
-  /** Gets the virtual dispatch branching limit when calculating field flow. */
-  int fieldFlowBranchLimit();
-
-  /** Holds if `source` is a relevant data flow source. */
-  predicate isSource(DataFlow::Node source);
-}
-
-/**
- * A module that encapsulates a barrier guard to remove false positives from flow like:
- * ```cpp
- * char *p = new char[size];
- * // ...
- * unsigned n = size;
- * // ...
- * if(n < size) {
- *   use(*p[n]);
- * }
- * ```
- * In this case, the sink pair identified by the product flow library (without any additional barriers)
- * would be `(p, n)` (where `n` is the `n` in `p[n]`), because there exists a pointer-arithmetic
- * instruction `pai = a + b` such that:
- * 1. the allocation flows to `a`, and
- * 2. `b <= n` where `n` is the `n` in `p[n]`
- * but because there's a strict comparison that compares `n` against the size of the allocation this
- * snippet is fine.
- */
-module SizeBarrier<SizeBarrierInputSig Input> {
-  private module SizeBarrierConfig implements DataFlow::ConfigSig {
-    predicate isSource = Input::isSource/1;
-
-    predicate fieldFlowBranchLimit = Input::fieldFlowBranchLimit/0;
-
-    /**
-     * Holds if `small <= large + k` holds if `g` evaluates to `testIsTrue`.
-     */
-    additional predicate isSink(
-      DataFlow::Node small, DataFlow::Node large, IRGuardCondition g, int k, boolean testIsTrue
-    ) {
-      // The sink is any "large" side of a relational comparison. i.e., the `large` expression
-      // in a guard such as `small <= large + k`.
-      g.comparesLt(small.asOperand(), large.asOperand(), k + 1, true, testIsTrue)
-    }
-
-    predicate isSink(DataFlow::Node sink) { isSink(_, sink, _, _, _) }
-  }
-
-  private module SizeBarrierFlow = DataFlow::Global<SizeBarrierConfig>;
-
-  private int getASizeAddend(DataFlow::Node node) {
-    exists(DataFlow::Node source |
-      SizeBarrierFlow::flow(source, node) and
-      hasSize(_, source, result)
-    )
-  }
-
-  /**
-   * Holds if `small <= large + k` holds if `g` evaluates to `edge`.
-   */
-  private predicate operandGuardChecks(
-    IRGuardCondition g, Operand small, DataFlow::Node large, int k, boolean edge
-  ) {
-    SizeBarrierFlow::flowTo(large) and
-    SizeBarrierConfig::isSink(DataFlow::operandNode(small), large, g, k, edge)
-  }
-
-  /**
-   * Gets an instruction `instr` that is guarded by a check such as `instr <= small + delta` where
-   * `small <= _ + k` and `small` is the "small side" of a relational comparison that checks
-   * whether `small <= size` where `size` is the size of an allocation.
-   */
-  private Instruction getABarrierInstruction0(int delta, int k) {
-    exists(
-      IRGuardCondition g, ValueNumber value, Operand small, boolean edge, DataFlow::Node large
-    |
-      // We know:
-      // 1. result <= value + delta (by `bounded`)
-      // 2. value <= large + k (by `operandGuardChecks`).
-      // So:
-      // result <= value + delta (by 1.)
-      //        <= large + k + delta (by 2.)
-      small = value.getAUse() and
-      operandGuardChecks(pragma[only_bind_into](g), pragma[only_bind_into](small), large,
-        pragma[only_bind_into](k), pragma[only_bind_into](edge)) and
-      bounded(result, value.getAnInstruction(), delta) and
-      g.controls(result.getBlock(), edge) and
-      k < getASizeAddend(large)
-    )
-  }
-
-  /**
-   * Gets an instruction that is guarded by a guard condition which ensures that
-   * the value of the instruction is upper-bounded by size of some allocation.
-   */
-  bindingset[state]
-  pragma[inline_late]
-  Instruction getABarrierInstruction(int state) {
-    exists(int delta, int k |
-      state > k + delta and
-      // result <= "size of allocation" + delta + k
-      //        < "size of allocation" + state
-      result = getABarrierInstruction0(delta, k)
-    )
-  }
-
-  /**
-   * Gets a `DataFlow::Node` that is guarded by a guard condition which ensures that
-   * the value of the node is upper-bounded by size of some allocation.
-   */
-  DataFlow::Node getABarrierNode(int state) {
-    exists(DataFlow::Node source, int delta, int k |
-      SizeBarrierFlow::flow(source, result) and
-      hasSize(_, source, state) and
-      result.asInstruction() = getABarrierInstruction0(delta, k) and
-      state > k + delta
-      // so now we have:
-      // result <= "size of allocation" + delta + k
-      //        < "size of allocation" + state
-    )
-  }
-}
--- a/cpp/ql/src/CHANGELOG.md
+++ b/cpp/ql/src/CHANGELOG.md
@@ -1,27 +1,8 @@
-## 1.4.5
-
-### Minor Analysis Improvements
-
-* The "Initialization code not run" query (`cpp/initialization-not-run`) no longer reports an alert on static global variables that have no dereference.
-
-## 1.4.4
-
-### Minor Analysis Improvements
-
-* Due to changes in the `FunctionWithWrappers` library (`semmle.code.cpp.security.FunctionWithWrappers`) the primary alert location generated by the queries `cpp/path-injection`, `cpp/sql-injection`, `cpp/tainted-format-string`, and `cpp/command-line-injection` may have changed.
-* Added flow models for the Win32 API functions `CreateThread`, `CreateRemoteThread`, and `CreateRemoteThreadEx`.
-* Improved support for dataflow through function objects and lambda expressions.
-* Added flow models for `pthread_create` and `std::thread`.
-* The `cpp/incorrect-string-type-conversion` query no longer alerts on incorrect type conversions that occur in unreachable code.
-* Added flow models for the GNU C Library.
-* Fixed a number of false positives and false negatives in `cpp/global-use-before-init`. Note that this query is not part of any of the default query suites.
-* The query `cpp/sql-injection` now can be extended using the `sql-injection` Models as Data (MaD) sink kind.
-
 ## 1.4.3

 ### Minor Analysis Improvements

-* Added flow models for the following libraries: `madler/zlib`, `google/brotli`, `libidn/libidn2`, `libssh2/libssh2`, `nghttp2/nghttp2`, `libuv/libuv`, and `curl/curl`. This may result in more alerts when running queries on codebases that use these libraries.
+* Added flow model for the following libraries: `madler/zlib`, `google/brotli`, `libidn/libidn2`, `libssh2/libssh2/`, `nghttp2/nghttp2`, `libuv/libuv/`, and `curl/curl`. This may result in more alerts when running queries on codebases that use these libraries.

 ## 1.4.2

@@ -31,7 +12,7 @@ No user-facing changes.

 ### Minor Analysis Improvements

-* Added flow models for the `SQLite` and `OpenSSL` libraries. This may result in more alerts when running queries on codebases that use these libraries.
+* Added flow model for the `SQLite` and `OpenSSL` libraries. This may result in more alerts when running queries on codebases that use these libraries.

 ## 1.4.0

--- a/cpp/ql/src/Critical/InitialisationNotRun.ql
+++ b/cpp/ql/src/Critical/InitialisationNotRun.ql
@@ -32,18 +32,9 @@ predicate called(Function f) {
  exists(FunctionAccess fa | fa.getTarget() = f)
 }

-predicate staticWithoutDereference(GlobalVariable v) {
-  v.isStatic() and
-  not exists(VariableAccess va |
-    va = v.getAnAccess() and
-    dereferenced(va)
-  )
-}
-
 from GlobalVariable v
 where
  global(v) and
-  not staticWithoutDereference(v) and
  not exists(VariableAccess lval |
    v.getAnAccess() = lval and
    lval.isUsedAsLValue() and
--- a/cpp/ql/src/Metrics/Classes/CNumberOfFunctions.qhelp
+++ b/cpp/ql/src/Metrics/Classes/CNumberOfFunctions.qhelp
@@ -49,16 +49,21 @@ need to be part of the class. (A classic example of this is the
 observes, there are at least two key problems with this approach:


-<i>1. It may be possible to generalize some of the utility functions beyond the
+<ul>
+<li>
+It may be possible to generalize some of the utility functions beyond the
 narrow context of the class in question -- by bundling them with the class,
 the class author reduces the scope for functionality reuse.
+</li>

-2. It's usually impossible for the class author to know every possible
+<li>
+It's usually impossible for the class author to know every possible
 operation that the user might want to perform on the class, so the public
 interface will inherently be incomplete. New utility functions will end up
 having a different syntax to the privileged public functions in the class,
 negatively impacting on code consistency.
-</i>
+</li>
+</ul>

 To refactor a class like this, simply move its utility functions elsewhere,
 paring its public interface down to the bare minimum.
--- a/cpp/ql/src/Metrics/Classes/CSizeOfAPI.qhelp
+++ b/cpp/ql/src/Metrics/Classes/CSizeOfAPI.qhelp
@@ -46,17 +46,21 @@ need to be part of the class. (A classic example of this is the
 <code>std::string</code> class in the C++ Standard Library.) As [Sutter]
 observes, there are at least two key problems with this approach:

-<i>
-1. It may be possible to generalize some of the utility functions beyond the
+<ul>
+<li>
+It may be possible to generalize some of the utility functions beyond the
 narrow context of the class in question -- by bundling them with the class,
 the class author reduces the scope for functionality reuse.
+</li>

-2. It's usually impossible for the class author to know every possible
+<li>
+It's usually impossible for the class author to know every possible
 operation that the user might want to perform on the class, so the public
 interface will inherently be incomplete. New utility functions will end up
 having a different syntax to the privileged public functions in the class,
 negatively impacting on code consistency.
-</i>
+</li>
+</ul>

 To refactor a class like this, simply move its utility functions elsewhere,
 paring its public interface down to the bare minimum.
--- a/cpp/ql/src/Security/CWE/CWE-114/UncontrolledProcessOperation.ql
+++ b/cpp/ql/src/Security/CWE/CWE-114/UncontrolledProcessOperation.ql
@@ -23,7 +23,7 @@ predicate isProcessOperationExplanation(DataFlow::Node arg, string processOperat
  exists(int processOperationArg, FunctionCall call |
    isProcessOperationArgument(processOperation, processOperationArg) and
    call.getTarget().getName() = processOperation and
-    call.getArgument(processOperationArg) = arg.asIndirectExpr()
+    call.getArgument(processOperationArg) = [arg.asExpr(), arg.asIndirectExpr()]
  )
 }

--- a/cpp/ql/src/Security/CWE/CWE-119/OverrunWriteProductFlow.ql
+++ b/cpp/ql/src/Security/CWE/CWE-119/OverrunWriteProductFlow.ql
@@ -20,7 +20,6 @@ import semmle.code.cpp.models.interfaces.Allocation
 import semmle.code.cpp.models.interfaces.ArrayFunction
 import semmle.code.cpp.rangeanalysis.new.internal.semantic.analysis.RangeAnalysis
 import semmle.code.cpp.rangeanalysis.new.internal.semantic.SemanticExprSpecific
-import semmle.code.cpp.security.ProductFlowUtils.ProductFlowUtils
 import semmle.code.cpp.rangeanalysis.new.RangeAnalysisUtil
 import StringSizeFlow::PathGraph1
 import codeql.util.Unit
@@ -44,28 +43,20 @@ predicate hasSize(HeuristicAllocationExpr alloc, DataFlow::Node n, int state) {
  )
 }

-/**
- * Holds if `c` a call to an `ArrayFunction` with buffer argument `bufSink`,
- * and a size argument `sizeInstr` which satisfies `sizeInstr <= sizeBound + delta`.
- *
- * Furthermore, the `sizeSink` node is the dataflow node corresponding to
- * `sizeBound`, and the expression `eBuf` is the expression corresponding
- * to `bufInstr`.
- */
-predicate isSinkPairImpl0(
-  CallInstruction c, DataFlow::Node bufSink, DataFlow::Node sizeSink, int delta, Expr eBuf,
-  Instruction sizeBound, Instruction sizeInstr
+predicate isSinkPairImpl(
+  CallInstruction c, DataFlow::Node bufSink, DataFlow::Node sizeSink, int delta, Expr eBuf
 ) {
-  exists(int bufIndex, int sizeIndex, Instruction bufInstr, ArrayFunction func |
+  exists(
+    int bufIndex, int sizeIndex, Instruction sizeInstr, Instruction bufInstr, ArrayFunction func
+  |
    bufInstr = bufSink.asInstruction() and
    c.getArgument(bufIndex) = bufInstr and
-    sizeBound = sizeSink.asInstruction() and
-    c.getArgument(sizeIndex) = sizeInstr and
+    sizeInstr = sizeSink.asInstruction() and
    c.getStaticCallTarget() = func and
    pragma[only_bind_into](func)
        .hasArrayWithVariableSize(pragma[only_bind_into](bufIndex),
          pragma[only_bind_into](sizeIndex)) and
-    bounded(sizeInstr, sizeBound, delta) and
+    bounded(c.getArgument(sizeIndex), sizeInstr, delta) and
    eBuf = bufInstr.getUnconvertedResultExpression()
  )
 }
@@ -95,39 +86,99 @@ module ValidState {
  private module ValidStateConfig implements DataFlow::ConfigSig {
    predicate isSource(DataFlow::Node source) { hasSize(_, source, _) }

-    predicate isSink(DataFlow::Node sink) { isSinkPairImpl0(_, _, sink, _, _, _, _) }
+    predicate isSink(DataFlow::Node sink) { isSinkPairImpl(_, _, sink, _, _) }

-    predicate isBarrierOut(DataFlow::Node node) { DataFlow::flowsToBackEdge(node) }
+    predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
+      isAdditionalFlowStep2(node1, node2, _)
+    }
+
+    predicate includeHiddenNodes() { any() }
  }

  private import DataFlow::Global<ValidStateConfig>

-  predicate validState(DataFlow::Node source, DataFlow::Node sink, int value) {
-    hasSize(_, source, value) and
-    flow(source, sink)
+  private predicate inLoop(PathNode n) { n.getASuccessor+() = n }
+
+  /**
+   * Holds if `value` is a possible offset for `n`.
+   *
+   * To ensure termination, we limit `value` to be in the
+   * range `[-2, 2]` if the node is part of a loop. Without
+   * this restriction we wouldn't terminate on an example like:
+   * ```cpp
+   * while(unknown()) { size++; }
+   * ```
+   */
+  private predicate validStateImpl(PathNode n, int value) {
+    // If the dataflow node depends recursively on itself we restrict the range.
+    (inLoop(n) implies value = [-2 .. 2]) and
+    (
+      // For the dataflow source we have an allocation such as `malloc(size + k)`,
+      // and the value of the flow-state is then `k`.
+      hasSize(_, n.getNode(), value)
+      or
+      // For a dataflow sink any `value` that is strictly smaller than the delta
+      // needs to be a valid flow-state. That is, for a snippet like:
+      // ```
+      // p = b ? new char[size] : new char[size + 1];
+      // memset(p, 0, size + 2);
+      // ```
+      // the valid flow-states at the `memset` must include the set `{0, 1}` since the
+      // flow-state at `new char[size]` is `0`, and the flow-state at `new char[size + 1]`
+      // is `1`.
+      //
+      // So we find a valid flow-state at the sink's predecessor, and use the definition
+      // of our sink predicate to compute the valid flow-states at the sink.
+      exists(int delta, PathNode n0 |
+        n0.getASuccessor() = n and
+        validStateImpl(n0, value) and
+        isSinkPairImpl(_, _, n.getNode(), delta, _) and
+        delta > value
+      )
+      or
+      // For a non-source and non-sink node there is two cases to consider.
+      // 1. A node where we have to update the flow-state, or
+      // 2. A node that doesn't update the flow-state.
+      //
+      // For case 1, we compute the new flow-state by adding the constant operand of the
+      // `AddInstruction` to the flow-state of any predecessor node.
+      // For case 2 we simply propagate the valid flow-states from the predecessor node to
+      // the next one.
+      exists(PathNode n0, DataFlow::Node node0, DataFlow::Node node, int value0 |
+        n0.getASuccessor() = n and
+        validStateImpl(n0, value0) and
+        node = n.getNode() and
+        node0 = n0.getNode()
+      |
+        exists(int delta |
+          isAdditionalFlowStep2(node0, node, delta) and
+          value0 = value + delta
+        )
+        or
+        not isAdditionalFlowStep2(node0, node, _) and
+        value = value0
+      )
+    )
+  }
+
+  predicate validState(DataFlow::Node n, int value) {
+    validStateImpl(any(PathNode pn | pn.getNode() = n), value)
  }
 }

 import ValidState

-module SizeBarrierInput implements SizeBarrierInputSig {
-  int fieldFlowBranchLimit() { result = 2 }
-
-  predicate isSource(DataFlow::Node source) {
-    exists(int state |
-      hasSize(_, source, state) and
-      validState(source, _, state)
-    )
-  }
-}
-
-predicate isSinkPairImpl(
-  CallInstruction c, DataFlow::Node bufSink, DataFlow::Node sizeSink, int delta, Expr eBuf
-) {
-  exists(Instruction sizeBound, Instruction sizeInstr |
-    isSinkPairImpl0(c, bufSink, sizeSink, delta, eBuf, sizeBound, sizeInstr) and
-    not sizeBound = SizeBarrier<SizeBarrierInput>::getABarrierInstruction(delta) and
-    not sizeInstr = SizeBarrier<SizeBarrierInput>::getABarrierInstruction(delta)
+/**
+ * Holds if `node2` is a dataflow node that represents an addition of two operands `op1`
+ * and `op2` such that:
+ * 1. `node1` is the dataflow node that represents `op1`, and
+ * 2. the value of `op2` can be upper bounded by `delta.`
+ */
+predicate isAdditionalFlowStep2(DataFlow::Node node1, DataFlow::Node node2, int delta) {
+  exists(AddInstruction add, Operand op |
+    add.hasOperands(node1.asOperand(), op) and
+    semBounded(getSemanticExpr(op.getDef()), any(SemZeroBound zero), delta, true, _) and
+    node2.asInstruction() = add
  )
 }

@@ -147,14 +198,14 @@ module StringSizeConfig implements ProductFlow::StateConfigSig {
    // to the size of the allocation. This state is then checked in `isSinkPair`.
    exists(state1) and
    hasSize(bufSource.asExpr(), sizeSource, state2) and
-    validState(sizeSource, _, state2)
+    validState(sizeSource, state2)
  }

  predicate isSinkPair(
    DataFlow::Node bufSink, FlowState1 state1, DataFlow::Node sizeSink, FlowState2 state2
  ) {
    exists(state1) and
-    validState(_, sizeSink, state2) and
+    validState(sizeSink, state2) and
    exists(int delta |
      isSinkPairImpl(_, bufSink, sizeSink, delta, _) and
      delta > state2
@@ -163,8 +214,14 @@ module StringSizeConfig implements ProductFlow::StateConfigSig {

  predicate isBarrierOut2(DataFlow::Node node) { DataFlow::flowsToBackEdge(node) }

-  predicate isBarrier2(DataFlow::Node node, FlowState2 state) {
-    node = SizeBarrier<SizeBarrierInput>::getABarrierNode(state)
+  predicate isAdditionalFlowStep2(
+    DataFlow::Node node1, FlowState2 state1, DataFlow::Node node2, FlowState2 state2
+  ) {
+    validState(node2, state2) and
+    exists(int delta |
+      isAdditionalFlowStep2(node1, node2, delta) and
+      state1 = state2 + delta
+    )
  }
 }

--- a/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
+++ b/cpp/ql/src/Security/CWE/CWE-704/WcharCharConversion.ql
@@ -14,7 +14,6 @@

 import cpp
 import semmle.code.cpp.controlflow.Guards
-import semmle.code.cpp.ir.IR

 class WideCharPointerType extends PointerType {
  WideCharPointerType() { this.getBaseType() instanceof WideCharType }
@@ -109,9 +108,7 @@ where
  // Avoid cases where the cast is guarded by a check to determine if
  // unicode encoding is enabled in such a way to disallow the dangerous cast
  // at runtime.
-  not isLikelyDynamicallyChecked(e1) and
-  // Avoid cases in unreachable blocks.
-  any(EnterFunctionInstruction e).getASuccessor+().getAst() = e1
+  not isLikelyDynamicallyChecked(e1)
 select e1,
  "Conversion from " + e1.getType().toString() + " to " + e2.getType().toString() +
    ". Use of invalid string can lead to undefined behavior."
--- a/cpp/ql/src/change-notes/2025-06-20-sql-injection-models.md
+++ b/cpp/ql/src/change-notes/2025-06-20-sql-injection-models.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The query `cpp/sql-injection` now can be extended using the `sql-injection` Models as Data (MaD) sink kind.
--- a/cpp/ql/src/change-notes/2025-07-01-global-vars-ubi-query-fixes.md.md
+++ b/cpp/ql/src/change-notes/2025-07-01-global-vars-ubi-query-fixes.md.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Fixed a number of false positives and false negatives in `cpp/global-use-before-init`. Note that this query is not part of any of the default query suites.
--- a/cpp/ql/src/change-notes/released/1.4.1.md
+++ b/cpp/ql/src/change-notes/released/1.4.1.md
@@ -2,4 +2,4 @@

 ### Minor Analysis Improvements

-* Added flow models for the `SQLite` and `OpenSSL` libraries. This may result in more alerts when running queries on codebases that use these libraries.
+* Added flow model for the `SQLite` and `OpenSSL` libraries. This may result in more alerts when running queries on codebases that use these libraries.
--- a/cpp/ql/src/change-notes/released/1.4.3.md
+++ b/cpp/ql/src/change-notes/released/1.4.3.md
@@ -2,4 +2,4 @@

 ### Minor Analysis Improvements

-* Added flow models for the following libraries: `madler/zlib`, `google/brotli`, `libidn/libidn2`, `libssh2/libssh2`, `nghttp2/nghttp2`, `libuv/libuv`, and `curl/curl`. This may result in more alerts when running queries on codebases that use these libraries.
+* Added flow model for the following libraries: `madler/zlib`, `google/brotli`, `libidn/libidn2`, `libssh2/libssh2/`, `nghttp2/nghttp2`, `libuv/libuv/`, and `curl/curl`. This may result in more alerts when running queries on codebases that use these libraries.
--- a/cpp/ql/src/change-notes/released/1.4.4.md
+++ b/cpp/ql/src/change-notes/released/1.4.4.md
@@ -1,12 +0,0 @@
-## 1.4.4
-
-### Minor Analysis Improvements
-
-* Due to changes in the `FunctionWithWrappers` library (`semmle.code.cpp.security.FunctionWithWrappers`) the primary alert location generated by the queries `cpp/path-injection`, `cpp/sql-injection`, `cpp/tainted-format-string`, and `cpp/command-line-injection` may have changed.
-* Added flow models for the Win32 API functions `CreateThread`, `CreateRemoteThread`, and `CreateRemoteThreadEx`.
-* Improved support for dataflow through function objects and lambda expressions.
-* Added flow models for `pthread_create` and `std::thread`.
-* The `cpp/incorrect-string-type-conversion` query no longer alerts on incorrect type conversions that occur in unreachable code.
-* Added flow models for the GNU C Library.
-* Fixed a number of false positives and false negatives in `cpp/global-use-before-init`. Note that this query is not part of any of the default query suites.
-* The query `cpp/sql-injection` now can be extended using the `sql-injection` Models as Data (MaD) sink kind.
--- a/cpp/ql/src/change-notes/released/1.4.5.md
+++ b/cpp/ql/src/change-notes/released/1.4.5.md
@@ -1,5 +0,0 @@
-## 1.4.5
-
-### Minor Analysis Improvements
-
-* The "Initialization code not run" query (`cpp/initialization-not-run`) no longer reports an alert on static global variables that have no dereference.
--- a/cpp/ql/src/codeql-pack.release.yml
+++ b/cpp/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.4.5
+lastReleaseVersion: 1.4.3
--- a/cpp/ql/src/qlpack.yml
+++ b/cpp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-queries
-version: 1.4.5
+version: 1.4.4-dev
 groups:
  - cpp
  - queries
--- a/cpp/ql/test/library-tests/dataflow/asExpr/test.cpp
+++ b/cpp/ql/test/library-tests/dataflow/asExpr/test.cpp
@@ -37,21 +37,4 @@ void test_aggregate_literal() {

  int xs[] = {1, 2, 3}; // $ asExpr=1 asExpr=2 asExpr=3 asExpr={...}
  const int ys[] = {[0] = 4, [1] = 5, [0] = 6}; // $ asExpr=4 asExpr=5 asExpr=6 asExpr={...}
-}
-
-void test_postfix_crement(int *p, int q) {
-  p++; // $ asExpr="... ++" asIndirectExpr="... ++" asExpr=p asIndirectExpr=p
-  q++; // $ asExpr="... ++" asExpr=q
-  (p++); // $ asExpr="... ++" asIndirectExpr="... ++" asExpr="p(... ++)" asIndirectExpr="p(*... ++)"
-  (q++); // $ asExpr="... ++" asExpr="q(... ++)"
-  (void)(p++); // $ asExpr="p(... ++)" asIndirectExpr="p(*... ++)"
-  (void)(q++); // $ asExpr="q(... ++)"
-  (void)p++; // $ asExpr="p(... ++)" asIndirectExpr="p(*... ++)"
-  (void)q++; // $ asExpr="q(... ++)"
-  int *p1 = p++; // $ asExpr="... ++" asIndirectExpr="... ++" asExpr="p(... ++)" asIndirectExpr="p(*... ++)"
-  int q1 = q++; // $ asExpr="... ++" asExpr="q(... ++)"
-  (int*)(p++); // $ asExpr="... ++" asIndirectExpr="... ++" asExpr="p(... ++)" asIndirectExpr="p(*... ++)"
-  (int)(q++); // $ asExpr="... ++" asExpr="q(... ++)"
-  int *p2 = (int*)(p++); // $ asExpr="... ++" asIndirectExpr="... ++" asExpr="p(... ++)" asIndirectExpr="p(*... ++)"
-  int q2 = (int)(q++); // $ asExpr="... ++" asExpr="q(... ++)"
-}
+}
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/dataflow-consistency.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/dataflow-consistency.expected
@@ -6,15 +6,9 @@ uniqueEnclosingCallable
 | test.cpp:1126:33:1129:1 | {...} | Node should have one enclosing callable but has 0. |
 | test.cpp:1127:3:1127:13 | reads_input | Node should have one enclosing callable but has 0. |
 | test.cpp:1128:3:1128:21 | not_does_read_input | Node should have one enclosing callable but has 0. |
-| test.cpp:1158:18:1158:21 | call to sink | Node should have one enclosing callable but has 0. |
-| test.cpp:1158:18:1158:42 | ... , ... | Node should have one enclosing callable but has 0. |
-| test.cpp:1158:23:1158:31 | recursion | Node should have one enclosing callable but has 0. |
-| test.cpp:1158:35:1158:40 | call to source | Node should have one enclosing callable but has 0. |
 uniqueCallEnclosingCallable
 | test.cpp:864:47:864:54 | call to source | Call should have one enclosing callable but has 0. |
 | test.cpp:872:46:872:51 | call to source | Call should have one enclosing callable but has 0. |
-| test.cpp:1158:18:1158:21 | call to sink | Call should have one enclosing callable but has 0. |
-| test.cpp:1158:35:1158:40 | call to source | Call should have one enclosing callable but has 0. |
 uniqueType
 uniqueNodeLocation
 missingLocation
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/has-parameter-flow-out.ql
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/has-parameter-flow-out.ql
@@ -24,9 +24,10 @@ module AstTest {

 module IRTest {
  private import semmle.code.cpp.ir.dataflow.DataFlow
+  private import semmle.code.cpp.ir.dataflow.internal.DataFlowUtil

  private string stars(int k) {
-    k = [0 .. max(DataFlow::Node n, int i | n.isFinalValueOfParameter(_, i) | i)] and
+    k = [0 .. max(FinalParameterNode n | | n.getIndirectionIndex())] and
    (if k = 0 then result = "" else result = "*" + stars(k - 1))
  }

@@ -34,14 +35,14 @@ module IRTest {
    string getARelevantTag() { result = "ir-def" }

    predicate hasActualResult(Location location, string element, string tag, string value) {
-      exists(Function f, Parameter p, DataFlow::Node n, int i |
+      exists(Function f, Parameter p, FinalParameterNode n |
        p.isNamed() and
-        n.isFinalValueOfParameter(p, i) and
+        n.getParameter() = p and
        n.getFunction() = f and
        location = f.getLocation() and
        element = p.toString() and
        tag = "ir-def" and
-        value = stars(i) + p.getName()
+        value = stars(n.getIndirectionIndex()) + p.getName()
      )
    }
  }
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.cpp
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.cpp
@@ -1153,6 +1153,4 @@ namespace conflation_regression {
    *p = source(0);
    read_deref_deref(p);
  }
-}
-
-int recursion = (sink(recursion), source()); // clean
+}
--- a/cpp/ql/test/library-tests/dataflow/external-models/flow.expected
+++ b/cpp/ql/test/library-tests/dataflow/external-models/flow.expected
@@ -17,26 +17,13 @@ models
 | 16 | Source: ; ; false; ymlSource; ; ; ReturnValue; local; manual |
 | 17 | Source: boost::asio; ; false; read_until; ; ; Argument[*1]; remote; manual |
 | 18 | Summary: ; ; false; CommandLineToArgvA; ; ; Argument[*0]; ReturnValue[**]; taint; manual |
-| 19 | Summary: ; ; false; CreateRemoteThread; ; ; Argument[@4]; Argument[3].Parameter[@0]; value; manual |
-| 20 | Summary: ; ; false; CreateRemoteThreadEx; ; ; Argument[@4]; Argument[3].Parameter[@0]; value; manual |
-| 21 | Summary: ; ; false; CreateThread; ; ; Argument[@3]; Argument[2].Parameter[@0]; value; manual |
-| 22 | Summary: ; ; false; ReadFileEx; ; ; Argument[*3].Field[@hEvent]; Argument[4].Parameter[*2].Field[@hEvent]; value; manual |
-| 23 | Summary: ; ; false; RtlCopyDeviceMemory; ; ; Argument[*@1]; Argument[*@0]; value; manual |
-| 24 | Summary: ; ; false; RtlCopyMemory; ; ; Argument[*@1]; Argument[*@0]; value; manual |
-| 25 | Summary: ; ; false; RtlCopyMemoryNonTemporal; ; ; Argument[*@1]; Argument[*@0]; value; manual |
-| 26 | Summary: ; ; false; RtlCopyUnicodeString; ; ; Argument[*1].Field[*Buffer]; Argument[*0].Field[*Buffer]; value; manual |
-| 27 | Summary: ; ; false; RtlCopyVolatileMemory; ; ; Argument[*@1]; Argument[*@0]; value; manual |
-| 28 | Summary: ; ; false; RtlInitUnicodeString; ; ; Argument[*1]; Argument[*0].Field[*Buffer]; value; manual |
-| 29 | Summary: ; ; false; RtlMoveMemory; ; ; Argument[*@1]; Argument[*@0]; value; manual |
-| 30 | Summary: ; ; false; RtlMoveVolatileMemory; ; ; Argument[*@1]; Argument[*@0]; value; manual |
-| 31 | Summary: ; ; false; callWithArgument; ; ; Argument[1]; Argument[0].Parameter[0]; value; manual |
-| 32 | Summary: ; ; false; pthread_create; ; ; Argument[@3]; Argument[2].Parameter[@0]; value; manual |
-| 33 | Summary: ; ; false; ymlStepGenerated; ; ; Argument[0]; ReturnValue; taint; df-generated |
-| 34 | Summary: ; ; false; ymlStepManual; ; ; Argument[0]; ReturnValue; taint; manual |
-| 35 | Summary: ; ; false; ymlStepManual_with_body; ; ; Argument[0]; ReturnValue; taint; manual |
-| 36 | Summary: boost::asio; ; false; buffer; ; ; Argument[*0]; ReturnValue; taint; manual |
+| 19 | Summary: ; ; false; ReadFileEx; ; ; Argument[*3].Field[@hEvent]; Argument[4].Parameter[*2].Field[@hEvent]; value; manual |
+| 20 | Summary: ; ; false; ymlStepGenerated; ; ; Argument[0]; ReturnValue; taint; df-generated |
+| 21 | Summary: ; ; false; ymlStepManual; ; ; Argument[0]; ReturnValue; taint; manual |
+| 22 | Summary: ; ; false; ymlStepManual_with_body; ; ; Argument[0]; ReturnValue; taint; manual |
+| 23 | Summary: boost::asio; ; false; buffer; ; ; Argument[*0]; ReturnValue; taint; manual |
 edges
-| asio_streams.cpp:56:18:56:23 | [summary param] *0 in buffer | asio_streams.cpp:56:18:56:23 | [summary] to write: ReturnValue in buffer | provenance | MaD:36 |
+| asio_streams.cpp:56:18:56:23 | [summary param] *0 in buffer | asio_streams.cpp:56:18:56:23 | [summary] to write: ReturnValue in buffer | provenance | MaD:23 |
 | asio_streams.cpp:87:34:87:44 | read_until output argument | asio_streams.cpp:91:7:91:17 | recv_buffer | provenance | Src:MaD:17  |
 | asio_streams.cpp:87:34:87:44 | read_until output argument | asio_streams.cpp:93:29:93:39 | *recv_buffer | provenance | Src:MaD:17 Sink:MaD:2 |
 | asio_streams.cpp:97:37:97:44 | call to source | asio_streams.cpp:98:7:98:14 | send_str | provenance | TaintFunction |
@@ -45,10 +32,10 @@ edges
 | asio_streams.cpp:100:44:100:62 | call to buffer | asio_streams.cpp:101:7:101:17 | send_buffer | provenance |  |
 | asio_streams.cpp:100:44:100:62 | call to buffer | asio_streams.cpp:103:29:103:39 | *send_buffer | provenance | Sink:MaD:2 |
 | asio_streams.cpp:100:64:100:71 | *send_str | asio_streams.cpp:56:18:56:23 | [summary param] *0 in buffer | provenance |  |
-| asio_streams.cpp:100:64:100:71 | *send_str | asio_streams.cpp:100:44:100:62 | call to buffer | provenance | MaD:36 |
-| test.cpp:4:5:4:17 | [summary param] 0 in ymlStepManual | test.cpp:4:5:4:17 | [summary] to write: ReturnValue in ymlStepManual | provenance | MaD:34 |
-| test.cpp:5:5:5:20 | [summary param] 0 in ymlStepGenerated | test.cpp:5:5:5:20 | [summary] to write: ReturnValue in ymlStepGenerated | provenance | MaD:33 |
-| test.cpp:6:5:6:27 | [summary param] 0 in ymlStepManual_with_body | test.cpp:6:5:6:27 | [summary] to write: ReturnValue in ymlStepManual_with_body | provenance | MaD:35 |
+| asio_streams.cpp:100:64:100:71 | *send_str | asio_streams.cpp:100:44:100:62 | call to buffer | provenance | MaD:23 |
+| test.cpp:4:5:4:17 | [summary param] 0 in ymlStepManual | test.cpp:4:5:4:17 | [summary] to write: ReturnValue in ymlStepManual | provenance | MaD:21 |
+| test.cpp:5:5:5:20 | [summary param] 0 in ymlStepGenerated | test.cpp:5:5:5:20 | [summary] to write: ReturnValue in ymlStepGenerated | provenance | MaD:20 |
+| test.cpp:6:5:6:27 | [summary param] 0 in ymlStepManual_with_body | test.cpp:6:5:6:27 | [summary] to write: ReturnValue in ymlStepManual_with_body | provenance | MaD:22 |
 | test.cpp:7:47:7:52 | value2 | test.cpp:7:64:7:69 | value2 | provenance |  |
 | test.cpp:7:64:7:69 | value2 | test.cpp:7:5:7:30 | *ymlStepGenerated_with_body | provenance |  |
 | test.cpp:10:10:10:18 | call to ymlSource | test.cpp:10:10:10:18 | call to ymlSource | provenance | Src:MaD:16  |
@@ -60,49 +47,19 @@ edges
 | test.cpp:17:10:17:22 | call to ymlStepManual | test.cpp:17:10:17:22 | call to ymlStepManual | provenance |  |
 | test.cpp:17:10:17:22 | call to ymlStepManual | test.cpp:18:10:18:10 | y | provenance | Sink:MaD:1 |
 | test.cpp:17:24:17:24 | x | test.cpp:4:5:4:17 | [summary param] 0 in ymlStepManual | provenance |  |
-| test.cpp:17:24:17:24 | x | test.cpp:17:10:17:22 | call to ymlStepManual | provenance | MaD:34 |
+| test.cpp:17:24:17:24 | x | test.cpp:17:10:17:22 | call to ymlStepManual | provenance | MaD:21 |
 | test.cpp:21:10:21:25 | call to ymlStepGenerated | test.cpp:21:10:21:25 | call to ymlStepGenerated | provenance |  |
 | test.cpp:21:10:21:25 | call to ymlStepGenerated | test.cpp:22:10:22:10 | z | provenance | Sink:MaD:1 |
 | test.cpp:21:27:21:27 | x | test.cpp:5:5:5:20 | [summary param] 0 in ymlStepGenerated | provenance |  |
-| test.cpp:21:27:21:27 | x | test.cpp:21:10:21:25 | call to ymlStepGenerated | provenance | MaD:33 |
+| test.cpp:21:27:21:27 | x | test.cpp:21:10:21:25 | call to ymlStepGenerated | provenance | MaD:20 |
 | test.cpp:25:11:25:33 | call to ymlStepManual_with_body | test.cpp:25:11:25:33 | call to ymlStepManual_with_body | provenance |  |
 | test.cpp:25:11:25:33 | call to ymlStepManual_with_body | test.cpp:26:10:26:11 | y2 | provenance | Sink:MaD:1 |
 | test.cpp:25:35:25:35 | x | test.cpp:6:5:6:27 | [summary param] 0 in ymlStepManual_with_body | provenance |  |
-| test.cpp:25:35:25:35 | x | test.cpp:25:11:25:33 | call to ymlStepManual_with_body | provenance | MaD:35 |
+| test.cpp:25:35:25:35 | x | test.cpp:25:11:25:33 | call to ymlStepManual_with_body | provenance | MaD:22 |
 | test.cpp:32:11:32:36 | call to ymlStepGenerated_with_body | test.cpp:32:11:32:36 | call to ymlStepGenerated_with_body | provenance |  |
 | test.cpp:32:11:32:36 | call to ymlStepGenerated_with_body | test.cpp:33:10:33:11 | z2 | provenance | Sink:MaD:1 |
 | test.cpp:32:41:32:41 | x | test.cpp:7:47:7:52 | value2 | provenance |  |
 | test.cpp:32:41:32:41 | x | test.cpp:32:11:32:36 | call to ymlStepGenerated_with_body | provenance |  |
-| test.cpp:46:30:46:32 | *arg [x] | test.cpp:47:12:47:19 | *arg [x] | provenance |  |
-| test.cpp:47:12:47:19 | *arg [x] | test.cpp:48:13:48:13 | *s [x] | provenance |  |
-| test.cpp:48:13:48:13 | *s [x] | test.cpp:48:16:48:16 | x | provenance | Sink:MaD:1 |
-| test.cpp:52:5:52:18 | [summary param] *3 in pthread_create [x] | test.cpp:52:5:52:18 | [summary] to write: Argument[2].Parameter[*0] in pthread_create [x] | provenance | MaD:32 |
-| test.cpp:52:5:52:18 | [summary] to write: Argument[2].Parameter[*0] in pthread_create [x] | test.cpp:46:30:46:32 | *arg [x] | provenance |  |
-| test.cpp:56:2:56:2 | *s [post update] [x] | test.cpp:59:55:59:64 | *& ... [x] | provenance |  |
-| test.cpp:56:2:56:18 | ... = ... | test.cpp:56:2:56:2 | *s [post update] [x] | provenance |  |
-| test.cpp:56:8:56:16 | call to ymlSource | test.cpp:56:2:56:18 | ... = ... | provenance | Src:MaD:16  |
-| test.cpp:59:55:59:64 | *& ... [x] | test.cpp:52:5:52:18 | [summary param] *3 in pthread_create [x] | provenance |  |
-| test.cpp:63:6:63:21 | [summary param] 1 in callWithArgument | test.cpp:63:6:63:21 | [summary] to write: Argument[0].Parameter[0] in callWithArgument | provenance | MaD:31 |
-| test.cpp:63:6:63:21 | [summary param] 1 in callWithArgument | test.cpp:63:6:63:21 | [summary] to write: Argument[0].Parameter[0] in callWithArgument | provenance | MaD:31 |
-| test.cpp:63:6:63:21 | [summary param] 1 in callWithArgument | test.cpp:63:6:63:21 | [summary] to write: Argument[0].Parameter[0] in callWithArgument | provenance | MaD:31 |
-| test.cpp:63:6:63:21 | [summary param] 1 in callWithArgument | test.cpp:63:6:63:21 | [summary] to write: Argument[0].Parameter[0] in callWithArgument | provenance | MaD:31 |
-| test.cpp:63:6:63:21 | [summary] to write: Argument[0].Parameter[0] in callWithArgument | test.cpp:68:22:68:22 | y | provenance |  |
-| test.cpp:63:6:63:21 | [summary] to write: Argument[0].Parameter[0] in callWithArgument | test.cpp:74:22:74:22 | y | provenance |  |
-| test.cpp:63:6:63:21 | [summary] to write: Argument[0].Parameter[0] in callWithArgument | test.cpp:82:22:82:22 | y | provenance |  |
-| test.cpp:63:6:63:21 | [summary] to write: Argument[0].Parameter[0] in callWithArgument | test.cpp:88:22:88:22 | y | provenance |  |
-| test.cpp:68:22:68:22 | y | test.cpp:69:11:69:11 | y | provenance | Sink:MaD:1 |
-| test.cpp:74:22:74:22 | y | test.cpp:75:11:75:11 | y | provenance | Sink:MaD:1 |
-| test.cpp:82:22:82:22 | y | test.cpp:83:11:83:11 | y | provenance | Sink:MaD:1 |
-| test.cpp:88:22:88:22 | y | test.cpp:89:11:89:11 | y | provenance | Sink:MaD:1 |
-| test.cpp:94:10:94:18 | call to ymlSource | test.cpp:94:10:94:18 | call to ymlSource | provenance | Src:MaD:16  |
-| test.cpp:94:10:94:18 | call to ymlSource | test.cpp:97:26:97:26 | x | provenance |  |
-| test.cpp:94:10:94:18 | call to ymlSource | test.cpp:101:26:101:26 | x | provenance |  |
-| test.cpp:94:10:94:18 | call to ymlSource | test.cpp:103:63:103:63 | x | provenance |  |
-| test.cpp:94:10:94:18 | call to ymlSource | test.cpp:104:62:104:62 | x | provenance |  |
-| test.cpp:97:26:97:26 | x | test.cpp:63:6:63:21 | [summary param] 1 in callWithArgument | provenance |  |
-| test.cpp:101:26:101:26 | x | test.cpp:63:6:63:21 | [summary param] 1 in callWithArgument | provenance |  |
-| test.cpp:103:63:103:63 | x | test.cpp:63:6:63:21 | [summary param] 1 in callWithArgument | provenance |  |
-| test.cpp:104:62:104:62 | x | test.cpp:63:6:63:21 | [summary param] 1 in callWithArgument | provenance |  |
 | windows.cpp:17:8:17:25 | [summary param] *0 in CommandLineToArgvA | windows.cpp:17:8:17:25 | [summary] to write: ReturnValue[**] in CommandLineToArgvA | provenance | MaD:18 |
 | windows.cpp:22:15:22:29 | *call to GetCommandLineA | windows.cpp:22:15:22:29 | *call to GetCommandLineA | provenance | Src:MaD:3  |
 | windows.cpp:22:15:22:29 | *call to GetCommandLineA | windows.cpp:24:8:24:11 | * ... | provenance |  |
@@ -116,8 +73,8 @@ edges
 | windows.cpp:39:36:39:38 | GetEnvironmentVariableA output argument | windows.cpp:41:10:41:13 | * ... | provenance | Src:MaD:5  |
 | windows.cpp:90:6:90:15 | [summary param] *3 in ReadFileEx [*hEvent] | windows.cpp:90:6:90:15 | [summary] read: Argument[*3].Field[*hEvent] in ReadFileEx | provenance |  |
 | windows.cpp:90:6:90:15 | [summary param] *3 in ReadFileEx [hEvent] | windows.cpp:90:6:90:15 | [summary] read: Argument[*3].Field[hEvent] in ReadFileEx | provenance |  |
-| windows.cpp:90:6:90:15 | [summary] read: Argument[*3].Field[*hEvent] in ReadFileEx | windows.cpp:90:6:90:15 | [summary] to write: Argument[4].Parameter[*2].Field[*hEvent] in ReadFileEx | provenance | MaD:22 |
-| windows.cpp:90:6:90:15 | [summary] read: Argument[*3].Field[hEvent] in ReadFileEx | windows.cpp:90:6:90:15 | [summary] to write: Argument[4].Parameter[*2].Field[hEvent] in ReadFileEx | provenance | MaD:22 |
+| windows.cpp:90:6:90:15 | [summary] read: Argument[*3].Field[*hEvent] in ReadFileEx | windows.cpp:90:6:90:15 | [summary] to write: Argument[4].Parameter[*2].Field[*hEvent] in ReadFileEx | provenance | MaD:19 |
+| windows.cpp:90:6:90:15 | [summary] read: Argument[*3].Field[hEvent] in ReadFileEx | windows.cpp:90:6:90:15 | [summary] to write: Argument[4].Parameter[*2].Field[hEvent] in ReadFileEx | provenance | MaD:19 |
 | windows.cpp:90:6:90:15 | [summary] to write: Argument[4].Parameter[*2] in ReadFileEx [*hEvent] | windows.cpp:147:16:147:27 | *lpOverlapped [*hEvent] | provenance |  |
 | windows.cpp:90:6:90:15 | [summary] to write: Argument[4].Parameter[*2] in ReadFileEx [hEvent] | windows.cpp:157:16:157:27 | *lpOverlapped [hEvent] | provenance |  |
 | windows.cpp:90:6:90:15 | [summary] to write: Argument[4].Parameter[*2].Field[*hEvent] in ReadFileEx | windows.cpp:90:6:90:15 | [summary] to write: Argument[4].Parameter[*2] in ReadFileEx [*hEvent] | provenance |  |
@@ -165,82 +122,6 @@ edges
 | windows.cpp:332:23:332:40 | *call to MapViewOfFileNuma2 | windows.cpp:332:23:332:40 | *call to MapViewOfFileNuma2 | provenance | Src:MaD:12  |
 | windows.cpp:332:23:332:40 | *call to MapViewOfFileNuma2 | windows.cpp:333:20:333:52 | *pMapView | provenance |  |
 | windows.cpp:333:20:333:52 | *pMapView | windows.cpp:335:10:335:16 | * ... | provenance |  |
-| windows.cpp:349:8:349:19 | [summary param] *3 in CreateThread [x] | windows.cpp:349:8:349:19 | [summary] to write: Argument[2].Parameter[*0] in CreateThread [x] | provenance | MaD:21 |
-| windows.cpp:349:8:349:19 | [summary] to write: Argument[2].Parameter[*0] in CreateThread [x] | windows.cpp:403:26:403:36 | *lpParameter [x] | provenance |  |
-| windows.cpp:357:8:357:25 | [summary param] *4 in CreateRemoteThread [x] | windows.cpp:357:8:357:25 | [summary] to write: Argument[3].Parameter[*0] in CreateRemoteThread [x] | provenance | MaD:19 |
-| windows.cpp:357:8:357:25 | [summary] to write: Argument[3].Parameter[*0] in CreateRemoteThread [x] | windows.cpp:410:26:410:36 | *lpParameter [x] | provenance |  |
-| windows.cpp:387:8:387:27 | [summary param] *4 in CreateRemoteThreadEx [x] | windows.cpp:387:8:387:27 | [summary] to write: Argument[3].Parameter[*0] in CreateRemoteThreadEx [x] | provenance | MaD:20 |
-| windows.cpp:387:8:387:27 | [summary] to write: Argument[3].Parameter[*0] in CreateRemoteThreadEx [x] | windows.cpp:417:26:417:36 | *lpParameter [x] | provenance |  |
-| windows.cpp:403:26:403:36 | *lpParameter [x] | windows.cpp:405:10:405:25 | *lpParameter [x] | provenance |  |
-| windows.cpp:405:10:405:25 | *lpParameter [x] | windows.cpp:406:8:406:8 | *s [x] | provenance |  |
-| windows.cpp:406:8:406:8 | *s [x] | windows.cpp:406:8:406:11 | x | provenance |  |
-| windows.cpp:410:26:410:36 | *lpParameter [x] | windows.cpp:412:10:412:25 | *lpParameter [x] | provenance |  |
-| windows.cpp:412:10:412:25 | *lpParameter [x] | windows.cpp:413:8:413:8 | *s [x] | provenance |  |
-| windows.cpp:413:8:413:8 | *s [x] | windows.cpp:413:8:413:11 | x | provenance |  |
-| windows.cpp:417:26:417:36 | *lpParameter [x] | windows.cpp:419:10:419:25 | *lpParameter [x] | provenance |  |
-| windows.cpp:419:10:419:25 | *lpParameter [x] | windows.cpp:420:8:420:8 | *s [x] | provenance |  |
-| windows.cpp:420:8:420:8 | *s [x] | windows.cpp:420:8:420:11 | x | provenance |  |
-| windows.cpp:431:3:431:3 | *s [post update] [x] | windows.cpp:439:7:439:8 | *& ... [x] | provenance |  |
-| windows.cpp:431:3:431:3 | *s [post update] [x] | windows.cpp:451:7:451:8 | *& ... [x] | provenance |  |
-| windows.cpp:431:3:431:3 | *s [post update] [x] | windows.cpp:464:7:464:8 | *& ... [x] | provenance |  |
-| windows.cpp:431:3:431:16 | ... = ... | windows.cpp:431:3:431:3 | *s [post update] [x] | provenance |  |
-| windows.cpp:431:9:431:14 | call to source | windows.cpp:431:3:431:16 | ... = ... | provenance |  |
-| windows.cpp:439:7:439:8 | *& ... [x] | windows.cpp:349:8:349:19 | [summary param] *3 in CreateThread [x] | provenance |  |
-| windows.cpp:451:7:451:8 | *& ... [x] | windows.cpp:357:8:357:25 | [summary param] *4 in CreateRemoteThread [x] | provenance |  |
-| windows.cpp:464:7:464:8 | *& ... [x] | windows.cpp:387:8:387:27 | [summary param] *4 in CreateRemoteThreadEx [x] | provenance |  |
-| windows.cpp:473:17:473:37 | [summary param] *1 in RtlCopyVolatileMemory | windows.cpp:473:17:473:37 | [summary param] *0 in RtlCopyVolatileMemory [Return] | provenance | MaD:27 |
-| windows.cpp:479:17:479:35 | [summary param] *1 in RtlCopyDeviceMemory | windows.cpp:479:17:479:35 | [summary param] *0 in RtlCopyDeviceMemory [Return] | provenance | MaD:23 |
-| windows.cpp:485:6:485:18 | [summary param] *1 in RtlCopyMemory | windows.cpp:485:6:485:18 | [summary param] *0 in RtlCopyMemory [Return] | provenance | MaD:24 |
-| windows.cpp:493:6:493:29 | [summary param] *1 in RtlCopyMemoryNonTemporal | windows.cpp:493:6:493:29 | [summary param] *0 in RtlCopyMemoryNonTemporal [Return] | provenance | MaD:25 |
-| windows.cpp:510:6:510:25 | [summary param] *1 in RtlCopyUnicodeString [*Buffer] | windows.cpp:510:6:510:25 | [summary] read: Argument[*1].Field[*Buffer] in RtlCopyUnicodeString | provenance |  |
-| windows.cpp:510:6:510:25 | [summary] read: Argument[*1].Field[*Buffer] in RtlCopyUnicodeString | windows.cpp:510:6:510:25 | [summary] to write: Argument[*0].Field[*Buffer] in RtlCopyUnicodeString | provenance | MaD:26 |
-| windows.cpp:510:6:510:25 | [summary] to write: Argument[*0] in RtlCopyUnicodeString [*Buffer] | windows.cpp:510:6:510:25 | [summary param] *0 in RtlCopyUnicodeString [Return] [*Buffer] | provenance |  |
-| windows.cpp:510:6:510:25 | [summary] to write: Argument[*0].Field[*Buffer] in RtlCopyUnicodeString | windows.cpp:510:6:510:25 | [summary] to write: Argument[*0] in RtlCopyUnicodeString [*Buffer] | provenance |  |
-| windows.cpp:515:6:515:18 | [summary param] *1 in RtlMoveMemory | windows.cpp:515:6:515:18 | [summary param] *0 in RtlMoveMemory [Return] | provenance | MaD:29 |
-| windows.cpp:521:17:521:37 | [summary param] *1 in RtlMoveVolatileMemory | windows.cpp:521:17:521:37 | [summary param] *0 in RtlMoveVolatileMemory [Return] | provenance | MaD:30 |
-| windows.cpp:527:6:527:25 | [summary param] *1 in RtlInitUnicodeString | windows.cpp:527:6:527:25 | [summary] to write: Argument[*0].Field[*Buffer] in RtlInitUnicodeString | provenance | MaD:28 |
-| windows.cpp:527:6:527:25 | [summary] to write: Argument[*0] in RtlInitUnicodeString [*Buffer] | windows.cpp:527:6:527:25 | [summary param] *0 in RtlInitUnicodeString [Return] [*Buffer] | provenance |  |
-| windows.cpp:527:6:527:25 | [summary] to write: Argument[*0].Field[*Buffer] in RtlInitUnicodeString | windows.cpp:527:6:527:25 | [summary] to write: Argument[*0] in RtlInitUnicodeString [*Buffer] | provenance |  |
-| windows.cpp:533:11:533:16 | call to source | windows.cpp:533:11:533:16 | call to source | provenance |  |
-| windows.cpp:533:11:533:16 | call to source | windows.cpp:537:40:537:41 | *& ... | provenance |  |
-| windows.cpp:533:11:533:16 | call to source | windows.cpp:542:38:542:39 | *& ... | provenance |  |
-| windows.cpp:533:11:533:16 | call to source | windows.cpp:547:32:547:33 | *& ... | provenance |  |
-| windows.cpp:533:11:533:16 | call to source | windows.cpp:552:43:552:44 | *& ... | provenance |  |
-| windows.cpp:533:11:533:16 | call to source | windows.cpp:568:32:568:33 | *& ... | provenance |  |
-| windows.cpp:533:11:533:16 | call to source | windows.cpp:573:40:573:41 | *& ... | provenance |  |
-| windows.cpp:537:27:537:37 | RtlCopyVolatileMemory output argument | windows.cpp:538:10:538:23 | access to array | provenance |  |
-| windows.cpp:537:40:537:41 | *& ... | windows.cpp:473:17:473:37 | [summary param] *1 in RtlCopyVolatileMemory | provenance |  |
-| windows.cpp:537:40:537:41 | *& ... | windows.cpp:537:27:537:37 | RtlCopyVolatileMemory output argument | provenance | MaD:27 |
-| windows.cpp:542:25:542:35 | RtlCopyDeviceMemory output argument | windows.cpp:543:10:543:23 | access to array | provenance |  |
-| windows.cpp:542:38:542:39 | *& ... | windows.cpp:479:17:479:35 | [summary param] *1 in RtlCopyDeviceMemory | provenance |  |
-| windows.cpp:542:38:542:39 | *& ... | windows.cpp:542:25:542:35 | RtlCopyDeviceMemory output argument | provenance | MaD:23 |
-| windows.cpp:547:19:547:29 | RtlCopyMemory output argument | windows.cpp:548:10:548:23 | access to array | provenance |  |
-| windows.cpp:547:32:547:33 | *& ... | windows.cpp:485:6:485:18 | [summary param] *1 in RtlCopyMemory | provenance |  |
-| windows.cpp:547:32:547:33 | *& ... | windows.cpp:547:19:547:29 | RtlCopyMemory output argument | provenance | MaD:24 |
-| windows.cpp:552:30:552:40 | RtlCopyMemoryNonTemporal output argument | windows.cpp:553:10:553:23 | access to array | provenance |  |
-| windows.cpp:552:43:552:44 | *& ... | windows.cpp:493:6:493:29 | [summary param] *1 in RtlCopyMemoryNonTemporal | provenance |  |
-| windows.cpp:552:43:552:44 | *& ... | windows.cpp:552:30:552:40 | RtlCopyMemoryNonTemporal output argument | provenance | MaD:25 |
-| windows.cpp:559:5:559:24 | ... = ... | windows.cpp:561:39:561:44 | *buffer | provenance |  |
-| windows.cpp:559:17:559:24 | call to source | windows.cpp:559:5:559:24 | ... = ... | provenance |  |
-| windows.cpp:561:26:561:36 | RtlInitUnicodeString output argument [*Buffer] | windows.cpp:562:10:562:19 | *src_string [*Buffer] | provenance |  |
-| windows.cpp:561:26:561:36 | RtlInitUnicodeString output argument [*Buffer] | windows.cpp:563:40:563:50 | *& ... [*Buffer] | provenance |  |
-| windows.cpp:561:39:561:44 | *buffer | windows.cpp:527:6:527:25 | [summary param] *1 in RtlInitUnicodeString | provenance |  |
-| windows.cpp:561:39:561:44 | *buffer | windows.cpp:561:26:561:36 | RtlInitUnicodeString output argument [*Buffer] | provenance | MaD:28 |
-| windows.cpp:562:10:562:19 | *src_string [*Buffer] | windows.cpp:562:10:562:29 | access to array | provenance |  |
-| windows.cpp:562:10:562:19 | *src_string [*Buffer] | windows.cpp:562:21:562:26 | *Buffer | provenance |  |
-| windows.cpp:562:21:562:26 | *Buffer | windows.cpp:562:10:562:29 | access to array | provenance |  |
-| windows.cpp:563:26:563:37 | RtlCopyUnicodeString output argument [*Buffer] | windows.cpp:564:10:564:20 | *dest_string [*Buffer] | provenance |  |
-| windows.cpp:563:40:563:50 | *& ... [*Buffer] | windows.cpp:510:6:510:25 | [summary param] *1 in RtlCopyUnicodeString [*Buffer] | provenance |  |
-| windows.cpp:563:40:563:50 | *& ... [*Buffer] | windows.cpp:563:26:563:37 | RtlCopyUnicodeString output argument [*Buffer] | provenance | MaD:26 |
-| windows.cpp:564:10:564:20 | *dest_string [*Buffer] | windows.cpp:564:10:564:30 | access to array | provenance |  |
-| windows.cpp:564:10:564:20 | *dest_string [*Buffer] | windows.cpp:564:22:564:27 | *Buffer | provenance |  |
-| windows.cpp:564:22:564:27 | *Buffer | windows.cpp:564:10:564:30 | access to array | provenance |  |
-| windows.cpp:568:19:568:29 | RtlMoveMemory output argument | windows.cpp:569:10:569:23 | access to array | provenance |  |
-| windows.cpp:568:32:568:33 | *& ... | windows.cpp:515:6:515:18 | [summary param] *1 in RtlMoveMemory | provenance |  |
-| windows.cpp:568:32:568:33 | *& ... | windows.cpp:568:19:568:29 | RtlMoveMemory output argument | provenance | MaD:29 |
-| windows.cpp:573:27:573:37 | RtlMoveVolatileMemory output argument | windows.cpp:574:10:574:23 | access to array | provenance |  |
-| windows.cpp:573:40:573:41 | *& ... | windows.cpp:521:17:521:37 | [summary param] *1 in RtlMoveVolatileMemory | provenance |  |
-| windows.cpp:573:40:573:41 | *& ... | windows.cpp:573:27:573:37 | RtlMoveVolatileMemory output argument | provenance | MaD:30 |
 nodes
 | asio_streams.cpp:56:18:56:23 | [summary param] *0 in buffer | semmle.label | [summary param] *0 in buffer |
 | asio_streams.cpp:56:18:56:23 | [summary] to write: ReturnValue in buffer | semmle.label | [summary] to write: ReturnValue in buffer |
@@ -282,38 +163,6 @@ nodes
 | test.cpp:32:11:32:36 | call to ymlStepGenerated_with_body | semmle.label | call to ymlStepGenerated_with_body |
 | test.cpp:32:41:32:41 | x | semmle.label | x |
 | test.cpp:33:10:33:11 | z2 | semmle.label | z2 |
-| test.cpp:46:30:46:32 | *arg [x] | semmle.label | *arg [x] |
-| test.cpp:47:12:47:19 | *arg [x] | semmle.label | *arg [x] |
-| test.cpp:48:13:48:13 | *s [x] | semmle.label | *s [x] |
-| test.cpp:48:16:48:16 | x | semmle.label | x |
-| test.cpp:52:5:52:18 | [summary param] *3 in pthread_create [x] | semmle.label | [summary param] *3 in pthread_create [x] |
-| test.cpp:52:5:52:18 | [summary] to write: Argument[2].Parameter[*0] in pthread_create [x] | semmle.label | [summary] to write: Argument[2].Parameter[*0] in pthread_create [x] |
-| test.cpp:56:2:56:2 | *s [post update] [x] | semmle.label | *s [post update] [x] |
-| test.cpp:56:2:56:18 | ... = ... | semmle.label | ... = ... |
-| test.cpp:56:8:56:16 | call to ymlSource | semmle.label | call to ymlSource |
-| test.cpp:59:55:59:64 | *& ... [x] | semmle.label | *& ... [x] |
-| test.cpp:63:6:63:21 | [summary param] 1 in callWithArgument | semmle.label | [summary param] 1 in callWithArgument |
-| test.cpp:63:6:63:21 | [summary param] 1 in callWithArgument | semmle.label | [summary param] 1 in callWithArgument |
-| test.cpp:63:6:63:21 | [summary param] 1 in callWithArgument | semmle.label | [summary param] 1 in callWithArgument |
-| test.cpp:63:6:63:21 | [summary param] 1 in callWithArgument | semmle.label | [summary param] 1 in callWithArgument |
-| test.cpp:63:6:63:21 | [summary] to write: Argument[0].Parameter[0] in callWithArgument | semmle.label | [summary] to write: Argument[0].Parameter[0] in callWithArgument |
-| test.cpp:63:6:63:21 | [summary] to write: Argument[0].Parameter[0] in callWithArgument | semmle.label | [summary] to write: Argument[0].Parameter[0] in callWithArgument |
-| test.cpp:63:6:63:21 | [summary] to write: Argument[0].Parameter[0] in callWithArgument | semmle.label | [summary] to write: Argument[0].Parameter[0] in callWithArgument |
-| test.cpp:63:6:63:21 | [summary] to write: Argument[0].Parameter[0] in callWithArgument | semmle.label | [summary] to write: Argument[0].Parameter[0] in callWithArgument |
-| test.cpp:68:22:68:22 | y | semmle.label | y |
-| test.cpp:69:11:69:11 | y | semmle.label | y |
-| test.cpp:74:22:74:22 | y | semmle.label | y |
-| test.cpp:75:11:75:11 | y | semmle.label | y |
-| test.cpp:82:22:82:22 | y | semmle.label | y |
-| test.cpp:83:11:83:11 | y | semmle.label | y |
-| test.cpp:88:22:88:22 | y | semmle.label | y |
-| test.cpp:89:11:89:11 | y | semmle.label | y |
-| test.cpp:94:10:94:18 | call to ymlSource | semmle.label | call to ymlSource |
-| test.cpp:94:10:94:18 | call to ymlSource | semmle.label | call to ymlSource |
-| test.cpp:97:26:97:26 | x | semmle.label | x |
-| test.cpp:101:26:101:26 | x | semmle.label | x |
-| test.cpp:103:63:103:63 | x | semmle.label | x |
-| test.cpp:104:62:104:62 | x | semmle.label | x |
 | windows.cpp:17:8:17:25 | [summary param] *0 in CommandLineToArgvA | semmle.label | [summary param] *0 in CommandLineToArgvA |
 | windows.cpp:17:8:17:25 | [summary] to write: ReturnValue[**] in CommandLineToArgvA | semmle.label | [summary] to write: ReturnValue[**] in CommandLineToArgvA |
 | windows.cpp:22:15:22:29 | *call to GetCommandLineA | semmle.label | *call to GetCommandLineA |
@@ -389,83 +238,6 @@ nodes
 | windows.cpp:332:23:332:40 | *call to MapViewOfFileNuma2 | semmle.label | *call to MapViewOfFileNuma2 |
 | windows.cpp:333:20:333:52 | *pMapView | semmle.label | *pMapView |
 | windows.cpp:335:10:335:16 | * ... | semmle.label | * ... |
-| windows.cpp:349:8:349:19 | [summary param] *3 in CreateThread [x] | semmle.label | [summary param] *3 in CreateThread [x] |
-| windows.cpp:349:8:349:19 | [summary] to write: Argument[2].Parameter[*0] in CreateThread [x] | semmle.label | [summary] to write: Argument[2].Parameter[*0] in CreateThread [x] |
-| windows.cpp:357:8:357:25 | [summary param] *4 in CreateRemoteThread [x] | semmle.label | [summary param] *4 in CreateRemoteThread [x] |
-| windows.cpp:357:8:357:25 | [summary] to write: Argument[3].Parameter[*0] in CreateRemoteThread [x] | semmle.label | [summary] to write: Argument[3].Parameter[*0] in CreateRemoteThread [x] |
-| windows.cpp:387:8:387:27 | [summary param] *4 in CreateRemoteThreadEx [x] | semmle.label | [summary param] *4 in CreateRemoteThreadEx [x] |
-| windows.cpp:387:8:387:27 | [summary] to write: Argument[3].Parameter[*0] in CreateRemoteThreadEx [x] | semmle.label | [summary] to write: Argument[3].Parameter[*0] in CreateRemoteThreadEx [x] |
-| windows.cpp:403:26:403:36 | *lpParameter [x] | semmle.label | *lpParameter [x] |
-| windows.cpp:405:10:405:25 | *lpParameter [x] | semmle.label | *lpParameter [x] |
-| windows.cpp:406:8:406:8 | *s [x] | semmle.label | *s [x] |
-| windows.cpp:406:8:406:11 | x | semmle.label | x |
-| windows.cpp:410:26:410:36 | *lpParameter [x] | semmle.label | *lpParameter [x] |
-| windows.cpp:412:10:412:25 | *lpParameter [x] | semmle.label | *lpParameter [x] |
-| windows.cpp:413:8:413:8 | *s [x] | semmle.label | *s [x] |
-| windows.cpp:413:8:413:11 | x | semmle.label | x |
-| windows.cpp:417:26:417:36 | *lpParameter [x] | semmle.label | *lpParameter [x] |
-| windows.cpp:419:10:419:25 | *lpParameter [x] | semmle.label | *lpParameter [x] |
-| windows.cpp:420:8:420:8 | *s [x] | semmle.label | *s [x] |
-| windows.cpp:420:8:420:11 | x | semmle.label | x |
-| windows.cpp:431:3:431:3 | *s [post update] [x] | semmle.label | *s [post update] [x] |
-| windows.cpp:431:3:431:16 | ... = ... | semmle.label | ... = ... |
-| windows.cpp:431:9:431:14 | call to source | semmle.label | call to source |
-| windows.cpp:439:7:439:8 | *& ... [x] | semmle.label | *& ... [x] |
-| windows.cpp:451:7:451:8 | *& ... [x] | semmle.label | *& ... [x] |
-| windows.cpp:464:7:464:8 | *& ... [x] | semmle.label | *& ... [x] |
-| windows.cpp:473:17:473:37 | [summary param] *0 in RtlCopyVolatileMemory [Return] | semmle.label | [summary param] *0 in RtlCopyVolatileMemory [Return] |
-| windows.cpp:473:17:473:37 | [summary param] *1 in RtlCopyVolatileMemory | semmle.label | [summary param] *1 in RtlCopyVolatileMemory |
-| windows.cpp:479:17:479:35 | [summary param] *0 in RtlCopyDeviceMemory [Return] | semmle.label | [summary param] *0 in RtlCopyDeviceMemory [Return] |
-| windows.cpp:479:17:479:35 | [summary param] *1 in RtlCopyDeviceMemory | semmle.label | [summary param] *1 in RtlCopyDeviceMemory |
-| windows.cpp:485:6:485:18 | [summary param] *0 in RtlCopyMemory [Return] | semmle.label | [summary param] *0 in RtlCopyMemory [Return] |
-| windows.cpp:485:6:485:18 | [summary param] *1 in RtlCopyMemory | semmle.label | [summary param] *1 in RtlCopyMemory |
-| windows.cpp:493:6:493:29 | [summary param] *0 in RtlCopyMemoryNonTemporal [Return] | semmle.label | [summary param] *0 in RtlCopyMemoryNonTemporal [Return] |
-| windows.cpp:493:6:493:29 | [summary param] *1 in RtlCopyMemoryNonTemporal | semmle.label | [summary param] *1 in RtlCopyMemoryNonTemporal |
-| windows.cpp:510:6:510:25 | [summary param] *0 in RtlCopyUnicodeString [Return] [*Buffer] | semmle.label | [summary param] *0 in RtlCopyUnicodeString [Return] [*Buffer] |
-| windows.cpp:510:6:510:25 | [summary param] *1 in RtlCopyUnicodeString [*Buffer] | semmle.label | [summary param] *1 in RtlCopyUnicodeString [*Buffer] |
-| windows.cpp:510:6:510:25 | [summary] read: Argument[*1].Field[*Buffer] in RtlCopyUnicodeString | semmle.label | [summary] read: Argument[*1].Field[*Buffer] in RtlCopyUnicodeString |
-| windows.cpp:510:6:510:25 | [summary] to write: Argument[*0] in RtlCopyUnicodeString [*Buffer] | semmle.label | [summary] to write: Argument[*0] in RtlCopyUnicodeString [*Buffer] |
-| windows.cpp:510:6:510:25 | [summary] to write: Argument[*0].Field[*Buffer] in RtlCopyUnicodeString | semmle.label | [summary] to write: Argument[*0].Field[*Buffer] in RtlCopyUnicodeString |
-| windows.cpp:515:6:515:18 | [summary param] *0 in RtlMoveMemory [Return] | semmle.label | [summary param] *0 in RtlMoveMemory [Return] |
-| windows.cpp:515:6:515:18 | [summary param] *1 in RtlMoveMemory | semmle.label | [summary param] *1 in RtlMoveMemory |
-| windows.cpp:521:17:521:37 | [summary param] *0 in RtlMoveVolatileMemory [Return] | semmle.label | [summary param] *0 in RtlMoveVolatileMemory [Return] |
-| windows.cpp:521:17:521:37 | [summary param] *1 in RtlMoveVolatileMemory | semmle.label | [summary param] *1 in RtlMoveVolatileMemory |
-| windows.cpp:527:6:527:25 | [summary param] *0 in RtlInitUnicodeString [Return] [*Buffer] | semmle.label | [summary param] *0 in RtlInitUnicodeString [Return] [*Buffer] |
-| windows.cpp:527:6:527:25 | [summary param] *1 in RtlInitUnicodeString | semmle.label | [summary param] *1 in RtlInitUnicodeString |
-| windows.cpp:527:6:527:25 | [summary] to write: Argument[*0] in RtlInitUnicodeString [*Buffer] | semmle.label | [summary] to write: Argument[*0] in RtlInitUnicodeString [*Buffer] |
-| windows.cpp:527:6:527:25 | [summary] to write: Argument[*0].Field[*Buffer] in RtlInitUnicodeString | semmle.label | [summary] to write: Argument[*0].Field[*Buffer] in RtlInitUnicodeString |
-| windows.cpp:533:11:533:16 | call to source | semmle.label | call to source |
-| windows.cpp:533:11:533:16 | call to source | semmle.label | call to source |
-| windows.cpp:537:27:537:37 | RtlCopyVolatileMemory output argument | semmle.label | RtlCopyVolatileMemory output argument |
-| windows.cpp:537:40:537:41 | *& ... | semmle.label | *& ... |
-| windows.cpp:538:10:538:23 | access to array | semmle.label | access to array |
-| windows.cpp:542:25:542:35 | RtlCopyDeviceMemory output argument | semmle.label | RtlCopyDeviceMemory output argument |
-| windows.cpp:542:38:542:39 | *& ... | semmle.label | *& ... |
-| windows.cpp:543:10:543:23 | access to array | semmle.label | access to array |
-| windows.cpp:547:19:547:29 | RtlCopyMemory output argument | semmle.label | RtlCopyMemory output argument |
-| windows.cpp:547:32:547:33 | *& ... | semmle.label | *& ... |
-| windows.cpp:548:10:548:23 | access to array | semmle.label | access to array |
-| windows.cpp:552:30:552:40 | RtlCopyMemoryNonTemporal output argument | semmle.label | RtlCopyMemoryNonTemporal output argument |
-| windows.cpp:552:43:552:44 | *& ... | semmle.label | *& ... |
-| windows.cpp:553:10:553:23 | access to array | semmle.label | access to array |
-| windows.cpp:559:5:559:24 | ... = ... | semmle.label | ... = ... |
-| windows.cpp:559:17:559:24 | call to source | semmle.label | call to source |
-| windows.cpp:561:26:561:36 | RtlInitUnicodeString output argument [*Buffer] | semmle.label | RtlInitUnicodeString output argument [*Buffer] |
-| windows.cpp:561:39:561:44 | *buffer | semmle.label | *buffer |
-| windows.cpp:562:10:562:19 | *src_string [*Buffer] | semmle.label | *src_string [*Buffer] |
-| windows.cpp:562:10:562:29 | access to array | semmle.label | access to array |
-| windows.cpp:562:21:562:26 | *Buffer | semmle.label | *Buffer |
-| windows.cpp:563:26:563:37 | RtlCopyUnicodeString output argument [*Buffer] | semmle.label | RtlCopyUnicodeString output argument [*Buffer] |
-| windows.cpp:563:40:563:50 | *& ... [*Buffer] | semmle.label | *& ... [*Buffer] |
-| windows.cpp:564:10:564:20 | *dest_string [*Buffer] | semmle.label | *dest_string [*Buffer] |
-| windows.cpp:564:10:564:30 | access to array | semmle.label | access to array |
-| windows.cpp:564:22:564:27 | *Buffer | semmle.label | *Buffer |
-| windows.cpp:568:19:568:29 | RtlMoveMemory output argument | semmle.label | RtlMoveMemory output argument |
-| windows.cpp:568:32:568:33 | *& ... | semmle.label | *& ... |
-| windows.cpp:569:10:569:23 | access to array | semmle.label | access to array |
-| windows.cpp:573:27:573:37 | RtlMoveVolatileMemory output argument | semmle.label | RtlMoveVolatileMemory output argument |
-| windows.cpp:573:40:573:41 | *& ... | semmle.label | *& ... |
-| windows.cpp:574:10:574:23 | access to array | semmle.label | access to array |
 subpaths
 | asio_streams.cpp:100:64:100:71 | *send_str | asio_streams.cpp:56:18:56:23 | [summary param] *0 in buffer | asio_streams.cpp:56:18:56:23 | [summary] to write: ReturnValue in buffer | asio_streams.cpp:100:44:100:62 | call to buffer |
 | test.cpp:17:24:17:24 | x | test.cpp:4:5:4:17 | [summary param] 0 in ymlStepManual | test.cpp:4:5:4:17 | [summary] to write: ReturnValue in ymlStepManual | test.cpp:17:10:17:22 | call to ymlStepManual |
@@ -473,12 +245,4 @@ subpaths
 | test.cpp:25:35:25:35 | x | test.cpp:6:5:6:27 | [summary param] 0 in ymlStepManual_with_body | test.cpp:6:5:6:27 | [summary] to write: ReturnValue in ymlStepManual_with_body | test.cpp:25:11:25:33 | call to ymlStepManual_with_body |
 | test.cpp:32:41:32:41 | x | test.cpp:7:47:7:52 | value2 | test.cpp:7:5:7:30 | *ymlStepGenerated_with_body | test.cpp:32:11:32:36 | call to ymlStepGenerated_with_body |
 | windows.cpp:27:36:27:38 | *cmd | windows.cpp:17:8:17:25 | [summary param] *0 in CommandLineToArgvA | windows.cpp:17:8:17:25 | [summary] to write: ReturnValue[**] in CommandLineToArgvA | windows.cpp:27:17:27:34 | **call to CommandLineToArgvA |
-| windows.cpp:537:40:537:41 | *& ... | windows.cpp:473:17:473:37 | [summary param] *1 in RtlCopyVolatileMemory | windows.cpp:473:17:473:37 | [summary param] *0 in RtlCopyVolatileMemory [Return] | windows.cpp:537:27:537:37 | RtlCopyVolatileMemory output argument |
-| windows.cpp:542:38:542:39 | *& ... | windows.cpp:479:17:479:35 | [summary param] *1 in RtlCopyDeviceMemory | windows.cpp:479:17:479:35 | [summary param] *0 in RtlCopyDeviceMemory [Return] | windows.cpp:542:25:542:35 | RtlCopyDeviceMemory output argument |
-| windows.cpp:547:32:547:33 | *& ... | windows.cpp:485:6:485:18 | [summary param] *1 in RtlCopyMemory | windows.cpp:485:6:485:18 | [summary param] *0 in RtlCopyMemory [Return] | windows.cpp:547:19:547:29 | RtlCopyMemory output argument |
-| windows.cpp:552:43:552:44 | *& ... | windows.cpp:493:6:493:29 | [summary param] *1 in RtlCopyMemoryNonTemporal | windows.cpp:493:6:493:29 | [summary param] *0 in RtlCopyMemoryNonTemporal [Return] | windows.cpp:552:30:552:40 | RtlCopyMemoryNonTemporal output argument |
-| windows.cpp:561:39:561:44 | *buffer | windows.cpp:527:6:527:25 | [summary param] *1 in RtlInitUnicodeString | windows.cpp:527:6:527:25 | [summary param] *0 in RtlInitUnicodeString [Return] [*Buffer] | windows.cpp:561:26:561:36 | RtlInitUnicodeString output argument [*Buffer] |
-| windows.cpp:563:40:563:50 | *& ... [*Buffer] | windows.cpp:510:6:510:25 | [summary param] *1 in RtlCopyUnicodeString [*Buffer] | windows.cpp:510:6:510:25 | [summary param] *0 in RtlCopyUnicodeString [Return] [*Buffer] | windows.cpp:563:26:563:37 | RtlCopyUnicodeString output argument [*Buffer] |
-| windows.cpp:568:32:568:33 | *& ... | windows.cpp:515:6:515:18 | [summary param] *1 in RtlMoveMemory | windows.cpp:515:6:515:18 | [summary param] *0 in RtlMoveMemory [Return] | windows.cpp:568:19:568:29 | RtlMoveMemory output argument |
-| windows.cpp:573:40:573:41 | *& ... | windows.cpp:521:17:521:37 | [summary param] *1 in RtlMoveVolatileMemory | windows.cpp:521:17:521:37 | [summary param] *0 in RtlMoveVolatileMemory [Return] | windows.cpp:573:27:573:37 | RtlMoveVolatileMemory output argument |
 testFailures
--- a/cpp/ql/test/library-tests/dataflow/external-models/flow.ext.yml
+++ b/cpp/ql/test/library-tests/dataflow/external-models/flow.ext.yml
@@ -16,5 +16,4 @@ extensions:
      - ["", "", False, "ymlStepManual", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
      - ["", "", False, "ymlStepGenerated", "", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
      - ["", "", False, "ymlStepManual_with_body", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["", "", False, "ymlStepGenerated_with_body", "", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["", "", False, "callWithArgument", "", "", "Argument[1]", "Argument[0].Parameter[0]", "value", "manual"]
+      - ["", "", False, "ymlStepGenerated_with_body", "", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
--- a/cpp/ql/test/library-tests/dataflow/external-models/sinks.expected
+++ b/cpp/ql/test/library-tests/dataflow/external-models/sinks.expected
@@ -8,8 +8,3 @@
 | test.cpp:29:10:29:11 | y3 | test-sink |
 | test.cpp:33:10:33:11 | z2 | test-sink |
 | test.cpp:36:10:36:11 | z3 | test-sink |
-| test.cpp:48:16:48:16 | x | test-sink |
-| test.cpp:69:11:69:11 | y | test-sink |
-| test.cpp:75:11:75:11 | y | test-sink |
-| test.cpp:83:11:83:11 | y | test-sink |
-| test.cpp:89:11:89:11 | y | test-sink |
--- a/cpp/ql/test/library-tests/dataflow/external-models/sources.expected
+++ b/cpp/ql/test/library-tests/dataflow/external-models/sources.expected
@@ -1,7 +1,5 @@
 | asio_streams.cpp:87:34:87:44 | read_until output argument | remote |
 | test.cpp:10:10:10:18 | call to ymlSource | local |
-| test.cpp:56:8:56:16 | call to ymlSource | local |
-| test.cpp:94:10:94:18 | call to ymlSource | local |
 | windows.cpp:22:15:22:29 | *call to GetCommandLineA | local |
 | windows.cpp:34:17:34:38 | *call to GetEnvironmentStringsA | local |
 | windows.cpp:39:36:39:38 | GetEnvironmentVariableA output argument | local |
--- a/cpp/ql/test/library-tests/dataflow/external-models/test.cpp
+++ b/cpp/ql/test/library-tests/dataflow/external-models/test.cpp
@@ -35,71 +35,3 @@ void test() {
 	int z3 = ymlStepGenerated_with_body(x, 0);
 	ymlSink(z3); // clean
 }
-
-struct S {
-	int x;
-};
-
-using pthread_t = unsigned long;
-using pthread_attr_t = void*;
-
-void *myThreadFunction(void *arg) {
-    S* s = (S *)arg;
-    ymlSink(s->x); // $ ir
-    return nullptr;
-}
-
-int pthread_create(pthread_t *thread, const pthread_attr_t * attr, void *(*start_routine)(void*), void *arg);
-
-int test_pthread_create() {
-	S s;
-	s.x = ymlSource();
-
-	pthread_t threadId;
-	pthread_create(&threadId, nullptr, myThreadFunction, (void *)&s);
-}
-
-template<typename F>
-void callWithArgument(F f, int x);
-
-struct StructWithOperatorCall_has_constructor {
-	StructWithOperatorCall_has_constructor();
-
-	void operator()(int y) {
-		ymlSink(y); // $ ir
-	}
-};
-
-struct StructWithOperatorCall_no_constructor {
-	void operator()(int y) {
-		ymlSink(y); // $ ir
-	}
-};
-
-struct StructWithOperatorCall_has_constructor_2 {
-	StructWithOperatorCall_has_constructor_2();
-
-	void operator()(int y) {
-		ymlSink(y); // $ ir
-	}
-};
-
-struct StructWithOperatorCall_no_constructor_2 {
-	void operator()(int y) {
-		ymlSink(y); // $ ir
-	}
-};
-
-void test_callWithArgument() {
-	int x = ymlSource();
-	{
-		StructWithOperatorCall_has_constructor func;
-		callWithArgument(func, x);
-	}
-	{
-		StructWithOperatorCall_no_constructor func;
-		callWithArgument(func, x);
-	}
-	callWithArgument(StructWithOperatorCall_has_constructor_2(), x);
-	callWithArgument(StructWithOperatorCall_no_constructor_2(), x);
-}
--- a/cpp/ql/test/library-tests/dataflow/external-models/validatemodels.expected
+++ b/cpp/ql/test/library-tests/dataflow/external-models/validatemodels.expected
--- a/cpp/ql/test/library-tests/dataflow/external-models/windows.cpp
+++ b/cpp/ql/test/library-tests/dataflow/external-models/windows.cpp
@@ -335,242 +335,3 @@ void mapViewOfFile(HANDLE hMapFile) {
    sink(*buffer); // $ ir
  }
 }
-
-typedef struct _SECURITY_ATTRIBUTES
-{
-  DWORD nLength;
-  LPVOID lpSecurityDescriptor;
-  BOOL bInheritHandle;
-} SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES;
-
-typedef DWORD (*LPTHREAD_START_ROUTINE)(
-    LPVOID lpThreadParameter);
-
-HANDLE CreateThread(
-    LPSECURITY_ATTRIBUTES lpThreadAttributes,
-    SIZE_T dwStackSize,
-    LPTHREAD_START_ROUTINE lpStartAddress,
-    LPVOID lpParameter,
-    DWORD dwCreationFlags,
-    LPDWORD lpThreadId);
-
-HANDLE CreateRemoteThread(
-  HANDLE                 hProcess,
-  LPSECURITY_ATTRIBUTES  lpThreadAttributes,
-  SIZE_T                 dwStackSize,
-  LPTHREAD_START_ROUTINE lpStartAddress,
-  LPVOID                 lpParameter,
-  DWORD                  dwCreationFlags,
-  LPDWORD                lpThreadId
-);
-
-typedef ULONG_PTR DWORD_PTR;
-
-typedef struct _PROC_THREAD_ATTRIBUTE_ENTRY
-{
-    DWORD_PTR   Attribute;
-    SIZE_T      cbSize;
-    PVOID       lpValue;
-} PROC_THREAD_ATTRIBUTE_ENTRY, *LPPROC_THREAD_ATTRIBUTE_ENTRY;
- 
-// This structure contains a list of attributes that have been added using UpdateProcThreadAttribute
-typedef struct _PROC_THREAD_ATTRIBUTE_LIST
-{
-    DWORD                          dwFlags;
-    ULONG                          Size;
-    ULONG                          Count;
-    ULONG                          Reserved;  
-    PULONG                         Unknown;
-    PROC_THREAD_ATTRIBUTE_ENTRY    Entries[1];
-} PROC_THREAD_ATTRIBUTE_LIST, *LPPROC_THREAD_ATTRIBUTE_LIST;
-
-HANDLE CreateRemoteThreadEx(
-  HANDLE                       hProcess,
-  LPSECURITY_ATTRIBUTES        lpThreadAttributes,
-  SIZE_T                       dwStackSize,
-  LPTHREAD_START_ROUTINE       lpStartAddress,
-  LPVOID                       lpParameter,
-  DWORD                        dwCreationFlags,
-  LPPROC_THREAD_ATTRIBUTE_LIST lpAttributeList,
-  LPDWORD                      lpThreadId
-);
-
-struct S
-{
-  int x;
-};
-
-DWORD ThreadProc1(LPVOID lpParameter)
-{
-  S *s = (S *)lpParameter;
-  sink(s->x); // $ ir
-  return 0;
-}
-
-DWORD ThreadProc2(LPVOID lpParameter)
-{
-  S *s = (S *)lpParameter;
-  sink(s->x); // $ ir
-  return 0;
-}
-
-DWORD ThreadProc3(LPVOID lpParameter)
-{
-  S *s = (S *)lpParameter;
-  sink(s->x); // $ ir
-  return 0;
-}
-
-int source();
-
-void test_create_thread()
-{
-  SECURITY_ATTRIBUTES sa;
-
-  S s;
-  s.x = source();
-
-  {
-  DWORD threadId;
-  HANDLE threadHandle = CreateThread(
-      &sa,
-      0,
-      ThreadProc1,
-      &s,
-      0,
-      &threadId);
-  }
-
-  {
-  DWORD threadId;
-  HANDLE threadHandle = CreateRemoteThread(
-      nullptr,
-      &sa,
-      0,
-      ThreadProc2,
-      &s,
-      0,
-      &threadId);
-  }
-
-  {
-  DWORD threadId;
-  PROC_THREAD_ATTRIBUTE_LIST attrList;
-  HANDLE threadHandle = CreateRemoteThreadEx(
-      nullptr,
-      &sa,
-      0,
-      ThreadProc3,
-      &s,
-      0,
-      &attrList,
-      &threadId);
-  }
-}
-
-using size_t = decltype(sizeof(0));
-
-volatile void * RtlCopyVolatileMemory(
-  volatile void       *Destination,
-  volatile const void *Source,
-  size_t              Length
-);
-
-volatile void * RtlCopyDeviceMemory(
-  volatile void       *Destination,
-  volatile const void *Source,
-  size_t              Length
-);
-
-void RtlCopyMemory(
-   void*       Destination,
-   const void* Source,
-   size_t      Length
-);
-
-using VOID = void;
-
-VOID RtlCopyMemoryNonTemporal(
-  VOID       *Destination,
-  const VOID *Source,
-  SIZE_T     Length
-);
-
-using USHORT = unsigned short;
-using PWSTR = wchar_t*;
-using PCWSTR = const wchar_t*;
-using PCUNICODE_STRING = const struct _UNICODE_STRING*;
-
-typedef struct _UNICODE_STRING {
-  USHORT Length;
-  USHORT MaximumLength;
-  PWSTR  Buffer;
-} UNICODE_STRING, *PUNICODE_STRING;
-
-VOID RtlCopyUnicodeString(
-  PUNICODE_STRING  DestinationString,
-  PCUNICODE_STRING SourceString
-);
-
-void RtlMoveMemory(
-   void*       Destination,
-   const void* Source,
-   size_t      Length
-);
-
-volatile void * RtlMoveVolatileMemory(
-  volatile void       *Destination,
-  volatile const void *Source,
-  size_t              Length
-);
-
-void RtlInitUnicodeString(
-  PUNICODE_STRING DestinationString,
-  PCWSTR          SourceString
-);
-
-void test_copy_and_move_memory() {
-  int x = source();
-
-  {
-    char dest_buffer[1024];
-    RtlCopyVolatileMemory(dest_buffer, &x, sizeof(x));
-    sink(dest_buffer[0]); // $ ir
-  }
-  {
-    char dest_buffer[1024];
-    RtlCopyDeviceMemory(dest_buffer, &x, sizeof(x));
-    sink(dest_buffer[0]); // $ ir
-  }
-  {
-    char dest_buffer[1024];
-    RtlCopyMemory(dest_buffer, &x, sizeof(x));
-    sink(dest_buffer[0]); // $ ir
-  }
-  {
-    char dest_buffer[1024];
-    RtlCopyMemoryNonTemporal(dest_buffer, &x, sizeof(x));
-    sink(dest_buffer[0]); // $ ir
-  }
-  {
-    UNICODE_STRING dest_string;
-    UNICODE_STRING src_string;
-    wchar_t buffer[1024];
-    buffer[0] = source();
-    
-    RtlInitUnicodeString(&src_string, buffer);
-    sink(src_string.Buffer[0]); // $ ir
-    RtlCopyUnicodeString(&dest_string, &src_string);
-    sink(dest_string.Buffer[0]); // $ ir
-  }
-  {
-    char dest_buffer[1024];
-    RtlMoveMemory(dest_buffer, &x, sizeof(x));
-    sink(dest_buffer[0]); // $ ir
-  }
-  {
-    volatile char dest_buffer[1024];
-    RtlMoveVolatileMemory(dest_buffer, &x, sizeof(x));
-    sink(dest_buffer[0]); // $ ir
-  }
-}
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected
@@ -7767,34 +7767,6 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | taint.cpp:830:20:830:34 | call to indirect_source | taint.cpp:832:23:832:24 | in |  |
 | taint.cpp:831:15:831:17 | out | taint.cpp:832:18:832:20 | out |  |
 | taint.cpp:831:15:831:17 | out | taint.cpp:833:8:833:10 | out |  |
-| thread.cpp:10:27:10:27 | s | thread.cpp:10:27:10:27 | s |  |
-| thread.cpp:10:27:10:27 | s | thread.cpp:11:8:11:8 | s |  |
-| thread.cpp:14:26:14:26 | s | thread.cpp:15:8:15:8 | s |  |
-| thread.cpp:18:27:18:27 | s | thread.cpp:18:27:18:27 | s |  |
-| thread.cpp:18:27:18:27 | s | thread.cpp:19:8:19:8 | s |  |
-| thread.cpp:18:34:18:34 | y | thread.cpp:20:8:20:8 | y |  |
-| thread.cpp:24:5:24:5 | s | thread.cpp:25:3:25:3 | s |  |
-| thread.cpp:24:5:24:5 | s | thread.cpp:26:38:26:38 | s |  |
-| thread.cpp:24:5:24:5 | s | thread.cpp:27:37:27:37 | s |  |
-| thread.cpp:24:5:24:5 | s | thread.cpp:28:38:28:38 | s |  |
-| thread.cpp:24:5:24:5 | s | thread.cpp:32:7:32:7 | s |  |
-| thread.cpp:25:3:25:3 | s [post update] | thread.cpp:26:38:26:38 | s |  |
-| thread.cpp:25:3:25:3 | s [post update] | thread.cpp:27:37:27:37 | s |  |
-| thread.cpp:25:3:25:3 | s [post update] | thread.cpp:28:38:28:38 | s |  |
-| thread.cpp:25:3:25:3 | s [post update] | thread.cpp:32:7:32:7 | s |  |
-| thread.cpp:25:3:25:16 | ... = ... | thread.cpp:25:5:25:5 | x [post update] |  |
-| thread.cpp:25:9:25:14 | call to source | thread.cpp:25:3:25:16 | ... = ... |  |
-| thread.cpp:26:18:26:39 | call to thread | thread.cpp:33:1:33:1 | t1 |  |
-| thread.cpp:26:38:26:38 | s | thread.cpp:26:37:26:38 | & ... |  |
-| thread.cpp:27:18:27:38 | call to thread | thread.cpp:33:1:33:1 | t2 |  |
-| thread.cpp:27:37:27:37 | ref arg s | thread.cpp:28:38:28:38 | s |  |
-| thread.cpp:27:37:27:37 | ref arg s | thread.cpp:32:7:32:7 | s |  |
-| thread.cpp:28:18:28:43 | call to thread | thread.cpp:33:1:33:1 | t3 |  |
-| thread.cpp:28:38:28:38 | s | thread.cpp:28:37:28:38 | & ... |  |
-| thread.cpp:30:18:32:8 | call to thread | thread.cpp:33:1:33:1 | t4 |  |
-| thread.cpp:30:24:30:24 | p | thread.cpp:30:24:30:24 | p |  |
-| thread.cpp:30:24:30:24 | p | thread.cpp:31:10:31:10 | p |  |
-| thread.cpp:32:7:32:7 | s | thread.cpp:32:6:32:7 | & ... |  |
 | vector.cpp:16:43:16:49 | source1 | vector.cpp:17:26:17:32 | source1 |  |
 | vector.cpp:16:43:16:49 | source1 | vector.cpp:31:38:31:44 | source1 |  |
 | vector.cpp:17:21:17:33 | call to vector | vector.cpp:19:14:19:14 | v |  |
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/stl.h
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/stl.h
@@ -681,17 +681,4 @@ namespace std {
 	// the model for `format`.
 	template <typename... Args>
 	int same_signature_as_format_but_different_name(format_string, Args &&...args);
-}
-
-namespace std {
-	class thread {
-		public:
-		template<class F, class... Args>
-		explicit thread(F&&, Args&&...);
-
-		~thread();
-
-		void join();
-		void detach();
-	};
 }
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/test_mad-signatures.expected
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/test_mad-signatures.expected
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/thread.cpp
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/thread.cpp
@@ -1,33 +0,0 @@
-#include "stl.h"
-
-int source();
-void sink(int);
-
-struct S {
-  int x;
-};
-
-void thread_function_1(S* s) {
-  sink(s->x); // $ ir
-}
-
-void thread_function_2(S s) {
-  sink(s.x); // $ ir
-}
-
-void thread_function_3(S* s, int y) {
-  sink(s->x); // $ ir
-  sink(y); // clean
-}
-
-void test_thread() {
-  S s;
-  s.x = source();
-  std::thread t1(thread_function_1, &s);
-  std::thread t2(thread_function_2, s);
-  std::thread t3(thread_function_3, &s, 42);
-
-  std::thread t4([](S* p) {
-    sink(p->x); // $ ir
-  }, &s);
-}
--- a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
+++ b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
@@ -24262,281 +24262,6 @@ ir.cpp:
 # 2725|       getExpr().getFullyConverted(): [ReferenceDereferenceExpr] (reference dereference)
 # 2725|           Type = [PlainCharType] char
 # 2725|           ValueCategory = prvalue(load)
-# 2728| [TopLevelFunction] void test_postfix_crement(int*, int)
-# 2728|   <params>: 
-# 2728|     getParameter(0): [Parameter] p
-# 2728|         Type = [IntPointerType] int *
-# 2728|     getParameter(1): [Parameter] q
-# 2728|         Type = [IntType] int
-# 2728|   getEntryPoint(): [BlockStmt] { ... }
-# 2729|     getStmt(0): [ExprStmt] ExprStmt
-# 2729|       getExpr(): [PostfixIncrExpr] ... ++
-# 2729|           Type = [IntPointerType] int *
-# 2729|           ValueCategory = prvalue
-# 2729|         getOperand(): [VariableAccess] p
-# 2729|             Type = [IntPointerType] int *
-# 2729|             ValueCategory = lvalue
-# 2730|     getStmt(1): [ExprStmt] ExprStmt
-# 2730|       getExpr(): [PostfixIncrExpr] ... ++
-# 2730|           Type = [IntType] int
-# 2730|           ValueCategory = prvalue
-# 2730|         getOperand(): [VariableAccess] q
-# 2730|             Type = [IntType] int
-# 2730|             ValueCategory = lvalue
-# 2731|     getStmt(2): [ExprStmt] ExprStmt
-# 2731|       getExpr(): [PostfixIncrExpr] ... ++
-# 2731|           Type = [IntPointerType] int *
-# 2731|           ValueCategory = prvalue
-# 2731|         getOperand(): [VariableAccess] p
-# 2731|             Type = [IntPointerType] int *
-# 2731|             ValueCategory = lvalue
-# 2731|       getExpr().getFullyConverted(): [ParenthesisExpr] (...)
-# 2731|           Type = [IntPointerType] int *
-# 2731|           ValueCategory = prvalue
-# 2732|     getStmt(3): [ExprStmt] ExprStmt
-# 2732|       getExpr(): [PostfixIncrExpr] ... ++
-# 2732|           Type = [IntType] int
-# 2732|           ValueCategory = prvalue
-# 2732|         getOperand(): [VariableAccess] q
-# 2732|             Type = [IntType] int
-# 2732|             ValueCategory = lvalue
-# 2732|       getExpr().getFullyConverted(): [ParenthesisExpr] (...)
-# 2732|           Type = [IntType] int
-# 2732|           ValueCategory = prvalue
-# 2733|     getStmt(4): [ExprStmt] ExprStmt
-# 2733|       getExpr(): [PostfixIncrExpr] ... ++
-# 2733|           Type = [IntPointerType] int *
-# 2733|           ValueCategory = prvalue
-# 2733|         getOperand(): [VariableAccess] p
-# 2733|             Type = [IntPointerType] int *
-# 2733|             ValueCategory = lvalue
-# 2733|       getExpr().getFullyConverted(): [CStyleCast] (void)...
-# 2733|           Conversion = [VoidConversion] conversion to void
-# 2733|           Type = [VoidType] void
-# 2733|           ValueCategory = prvalue
-# 2733|         getExpr(): [ParenthesisExpr] (...)
-# 2733|             Type = [IntPointerType] int *
-# 2733|             ValueCategory = prvalue
-# 2734|     getStmt(5): [ExprStmt] ExprStmt
-# 2734|       getExpr(): [PostfixIncrExpr] ... ++
-# 2734|           Type = [IntType] int
-# 2734|           ValueCategory = prvalue
-# 2734|         getOperand(): [VariableAccess] q
-# 2734|             Type = [IntType] int
-# 2734|             ValueCategory = lvalue
-# 2734|       getExpr().getFullyConverted(): [CStyleCast] (void)...
-# 2734|           Conversion = [VoidConversion] conversion to void
-# 2734|           Type = [VoidType] void
-# 2734|           ValueCategory = prvalue
-# 2734|         getExpr(): [ParenthesisExpr] (...)
-# 2734|             Type = [IntType] int
-# 2734|             ValueCategory = prvalue
-# 2735|     getStmt(6): [ExprStmt] ExprStmt
-# 2735|       getExpr(): [PostfixIncrExpr] ... ++
-# 2735|           Type = [IntPointerType] int *
-# 2735|           ValueCategory = prvalue
-# 2735|         getOperand(): [VariableAccess] p
-# 2735|             Type = [IntPointerType] int *
-# 2735|             ValueCategory = lvalue
-# 2735|       getExpr().getFullyConverted(): [CStyleCast] (void)...
-# 2735|           Conversion = [VoidConversion] conversion to void
-# 2735|           Type = [VoidType] void
-# 2735|           ValueCategory = prvalue
-# 2736|     getStmt(7): [ExprStmt] ExprStmt
-# 2736|       getExpr(): [PostfixIncrExpr] ... ++
-# 2736|           Type = [IntType] int
-# 2736|           ValueCategory = prvalue
-# 2736|         getOperand(): [VariableAccess] q
-# 2736|             Type = [IntType] int
-# 2736|             ValueCategory = lvalue
-# 2736|       getExpr().getFullyConverted(): [CStyleCast] (void)...
-# 2736|           Conversion = [VoidConversion] conversion to void
-# 2736|           Type = [VoidType] void
-# 2736|           ValueCategory = prvalue
-# 2737|     getStmt(8): [DeclStmt] declaration
-# 2737|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of p1
-# 2737|           Type = [IntPointerType] int *
-# 2737|         getVariable().getInitializer(): [Initializer] initializer for p1
-# 2737|           getExpr(): [PostfixIncrExpr] ... ++
-# 2737|               Type = [IntPointerType] int *
-# 2737|               ValueCategory = prvalue
-# 2737|             getOperand(): [VariableAccess] p
-# 2737|                 Type = [IntPointerType] int *
-# 2737|                 ValueCategory = lvalue
-# 2738|     getStmt(9): [DeclStmt] declaration
-# 2738|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of q1
-# 2738|           Type = [IntType] int
-# 2738|         getVariable().getInitializer(): [Initializer] initializer for q1
-# 2738|           getExpr(): [PostfixIncrExpr] ... ++
-# 2738|               Type = [IntType] int
-# 2738|               ValueCategory = prvalue
-# 2738|             getOperand(): [VariableAccess] q
-# 2738|                 Type = [IntType] int
-# 2738|                 ValueCategory = lvalue
-# 2739|     getStmt(10): [ExprStmt] ExprStmt
-# 2739|       getExpr(): [PostfixIncrExpr] ... ++
-# 2739|           Type = [IntPointerType] int *
-# 2739|           ValueCategory = prvalue
-# 2739|         getOperand(): [VariableAccess] p
-# 2739|             Type = [IntPointerType] int *
-# 2739|             ValueCategory = lvalue
-# 2739|       getExpr().getFullyConverted(): [CStyleCast] (int *)...
-# 2739|           Conversion = [PointerConversion] pointer conversion
-# 2739|           Type = [IntPointerType] int *
-# 2739|           ValueCategory = prvalue
-# 2739|         getExpr(): [ParenthesisExpr] (...)
-# 2739|             Type = [IntPointerType] int *
-# 2739|             ValueCategory = prvalue
-# 2740|     getStmt(11): [ExprStmt] ExprStmt
-# 2740|       getExpr(): [PostfixIncrExpr] ... ++
-# 2740|           Type = [IntType] int
-# 2740|           ValueCategory = prvalue
-# 2740|         getOperand(): [VariableAccess] q
-# 2740|             Type = [IntType] int
-# 2740|             ValueCategory = lvalue
-# 2740|       getExpr().getFullyConverted(): [CStyleCast] (int)...
-# 2740|           Conversion = [IntegralConversion] integral conversion
-# 2740|           Type = [IntType] int
-# 2740|           ValueCategory = prvalue
-# 2740|         getExpr(): [ParenthesisExpr] (...)
-# 2740|             Type = [IntType] int
-# 2740|             ValueCategory = prvalue
-# 2741|     getStmt(12): [DeclStmt] declaration
-# 2741|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of p2
-# 2741|           Type = [IntPointerType] int *
-# 2741|         getVariable().getInitializer(): [Initializer] initializer for p2
-# 2741|           getExpr(): [PostfixIncrExpr] ... ++
-# 2741|               Type = [IntPointerType] int *
-# 2741|               ValueCategory = prvalue
-# 2741|             getOperand(): [VariableAccess] p
-# 2741|                 Type = [IntPointerType] int *
-# 2741|                 ValueCategory = lvalue
-# 2741|           getExpr().getFullyConverted(): [CStyleCast] (int *)...
-# 2741|               Conversion = [PointerConversion] pointer conversion
-# 2741|               Type = [IntPointerType] int *
-# 2741|               ValueCategory = prvalue
-# 2741|             getExpr(): [ParenthesisExpr] (...)
-# 2741|                 Type = [IntPointerType] int *
-# 2741|                 ValueCategory = prvalue
-# 2742|     getStmt(13): [DeclStmt] declaration
-# 2742|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of q2
-# 2742|           Type = [IntType] int
-# 2742|         getVariable().getInitializer(): [Initializer] initializer for q2
-# 2742|           getExpr(): [PostfixIncrExpr] ... ++
-# 2742|               Type = [IntType] int
-# 2742|               ValueCategory = prvalue
-# 2742|             getOperand(): [VariableAccess] q
-# 2742|                 Type = [IntType] int
-# 2742|                 ValueCategory = lvalue
-# 2742|           getExpr().getFullyConverted(): [CStyleCast] (int)...
-# 2742|               Conversion = [IntegralConversion] integral conversion
-# 2742|               Type = [IntType] int
-# 2742|               ValueCategory = prvalue
-# 2742|             getExpr(): [ParenthesisExpr] (...)
-# 2742|                 Type = [IntType] int
-# 2742|                 ValueCategory = prvalue
-# 2743|     getStmt(14): [ReturnStmt] return ...
-# 2747| [CopyAssignmentOperator] std::strong_ordering& std::strong_ordering::operator=(std::strong_ordering const&)
-# 2747|   <params>: 
-#-----|     getParameter(0): [Parameter] (unnamed parameter 0)
-#-----|         Type = [LValueReferenceType] const strong_ordering &
-# 2747| [MoveAssignmentOperator] std::strong_ordering& std::strong_ordering::operator=(std::strong_ordering&&)
-# 2747|   <params>: 
-#-----|     getParameter(0): [Parameter] (unnamed parameter 0)
-#-----|         Type = [RValueReferenceType] strong_ordering &&
-# 2747| [CopyConstructor] void std::strong_ordering::strong_ordering(std::strong_ordering const&)
-# 2747|   <params>: 
-#-----|     getParameter(0): [Parameter] (unnamed parameter 0)
-#-----|         Type = [LValueReferenceType] const strong_ordering &
-# 2747| [MoveConstructor] void std::strong_ordering::strong_ordering(std::strong_ordering&&)
-# 2747|   <params>: 
-#-----|     getParameter(0): [Parameter] (unnamed parameter 0)
-#-----|         Type = [RValueReferenceType] strong_ordering &&
-# 2747|   <initializations>: 
-# 2747|   getEntryPoint(): [BlockStmt] { ... }
-# 2747|     getStmt(0): [ReturnStmt] return ...
-# 2748| [Constructor] void std::strong_ordering::strong_ordering(std::_Order)
-# 2748|   <params>: 
-# 2748|     getParameter(0): [Parameter] v
-# 2748|         Type = [ScopedEnum] _Order
-# 2748|   <initializations>: 
-# 2748|   getEntryPoint(): [BlockStmt] { ... }
-# 2748|     getStmt(0): [ReturnStmt] return ...
-# 2763| [CopyAssignmentOperator] ThreeWay& ThreeWay::operator=(ThreeWay const&)
-# 2763|   <params>: 
-#-----|     getParameter(0): [Parameter] (unnamed parameter 0)
-#-----|         Type = [LValueReferenceType] const ThreeWay &
-# 2763| [MoveAssignmentOperator] ThreeWay& ThreeWay::operator=(ThreeWay&&)
-# 2763|   <params>: 
-#-----|     getParameter(0): [Parameter] (unnamed parameter 0)
-#-----|         Type = [RValueReferenceType] ThreeWay &&
-# 2763| [Constructor] void ThreeWay::ThreeWay()
-# 2763|   <params>: 
-# 2766| [MemberFunction] std::strong_ordering ThreeWay::operator<=>(ThreeWay&)
-# 2766|   <params>: 
-# 2766|     getParameter(0): [Parameter] y
-# 2766|         Type = [LValueReferenceType] ThreeWay &
-# 2766|   getEntryPoint(): [BlockStmt] { ... }
-# 2766|     getStmt(0): [ReturnStmt] return ...
-# 2766|       getExpr(): [SpaceshipExpr] ... <=> ...
-# 2766|           Type = [Class] strong_ordering
-# 2766|           ValueCategory = prvalue
-# 2766|         getChild(0): [PointerFieldAccess] x
-# 2766|             Type = [IntType] int
-# 2766|             ValueCategory = prvalue(load)
-# 2766|           getQualifier(): [ThisExpr] this
-# 2766|               Type = [PointerType] ThreeWay *
-# 2766|               ValueCategory = prvalue(load)
-# 2766|         getChild(1): [ReferenceFieldAccess] x
-# 2766|             Type = [IntType] int
-# 2766|             ValueCategory = prvalue(load)
-# 2766|           getQualifier(): [VariableAccess] y
-# 2766|               Type = [LValueReferenceType] ThreeWay &
-# 2766|               ValueCategory = prvalue(load)
-# 2766|           getQualifier().getFullyConverted(): [ReferenceDereferenceExpr] (reference dereference)
-# 2766|               Type = [Class] ThreeWay
-# 2766|               ValueCategory = lvalue
-# 2769| [TopLevelFunction] void test_three_way(int, int, ThreeWay, ThreeWay)
-# 2769|   <params>: 
-# 2769|     getParameter(0): [Parameter] a
-# 2769|         Type = [IntType] int
-# 2769|     getParameter(1): [Parameter] b
-# 2769|         Type = [IntType] int
-# 2769|     getParameter(2): [Parameter] c
-# 2769|         Type = [Class] ThreeWay
-# 2769|     getParameter(3): [Parameter] d
-# 2769|         Type = [Class] ThreeWay
-# 2769|   getEntryPoint(): [BlockStmt] { ... }
-# 2770|     getStmt(0): [DeclStmt] declaration
-# 2770|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of x
-# 2770|           Type = [Class] strong_ordering
-# 2770|         getVariable().getInitializer(): [Initializer] initializer for x
-# 2770|           getExpr(): [SpaceshipExpr] ... <=> ...
-# 2770|               Type = [Class] strong_ordering
-# 2770|               ValueCategory = prvalue
-# 2770|             getChild(0): [VariableAccess] a
-# 2770|                 Type = [IntType] int
-# 2770|                 ValueCategory = prvalue(load)
-# 2770|             getChild(1): [VariableAccess] b
-# 2770|                 Type = [IntType] int
-# 2770|                 ValueCategory = prvalue(load)
-# 2771|     getStmt(1): [DeclStmt] declaration
-# 2771|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of y
-# 2771|           Type = [Class] strong_ordering
-# 2771|         getVariable().getInitializer(): [Initializer] initializer for y
-# 2771|           getExpr(): [FunctionCall] call to operator<=>
-# 2771|               Type = [Class] strong_ordering
-# 2771|               ValueCategory = prvalue
-# 2771|             getQualifier(): [VariableAccess] c
-# 2771|                 Type = [Class] ThreeWay
-# 2771|                 ValueCategory = lvalue
-# 2771|             getArgument(0): [VariableAccess] d
-# 2771|                 Type = [Class] ThreeWay
-# 2771|                 ValueCategory = lvalue
-# 2771|             getArgument(0).getFullyConverted(): [ReferenceToExpr] (reference to)
-# 2771|                 Type = [LValueReferenceType] ThreeWay &
-# 2771|                 ValueCategory = prvalue
-# 2772|     getStmt(2): [ReturnStmt] return ...
 ir23.cpp:
 #    1| [TopLevelFunction] bool consteval_1()
 #    1|   <params>: 
@@ -50275,42 +50000,3 @@ try_except.cpp:
 #   52|                 Type = [IntType] int
 #   52|                 ValueCategory = prvalue(load)
 #   54|     getStmt(2): [ReturnStmt] return ...
-type_info_test.cpp:
-#    3| [TopLevelFunction] void type_info_test(int)
-#    3|   <params>: 
-#    3|     getParameter(0): [Parameter] x
-#    3|         Type = [IntType] int
-#    3|   getEntryPoint(): [BlockStmt] { ... }
-#    4|     getStmt(0): [DeclStmt] declaration
-#    4|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of t1
-#    4|           Type = [LValueReferenceType] const type_info &
-#    4|         getVariable().getInitializer(): [Initializer] initializer for t1
-#    4|           getExpr(): [TypeidOperator] typeid ...
-#    4|               Type = [SpecifiedType] const type_info
-#    4|               ValueCategory = lvalue
-#    4|             getExpr(): [VariableAccess] x
-#    4|                 Type = [IntType] int
-#    4|                 ValueCategory = lvalue
-#    4|           getExpr().getFullyConverted(): [ReferenceToExpr] (reference to)
-#    4|               Type = [LValueReferenceType] const type_info &
-#    4|               ValueCategory = prvalue
-#    5|     getStmt(1): [DeclStmt] declaration
-#    5|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of t2
-#    5|           Type = [LValueReferenceType] const type_info &
-#    5|         getVariable().getInitializer(): [Initializer] initializer for t2
-#    5|           getExpr(): [TypeidOperator] typeid ...
-#    5|               Type = [SpecifiedType] const type_info
-#    5|               ValueCategory = lvalue
-#    5|           getExpr().getFullyConverted(): [ReferenceToExpr] (reference to)
-#    5|               Type = [LValueReferenceType] const type_info &
-#    5|               ValueCategory = prvalue
-#    6|     getStmt(2): [ReturnStmt] return ...
-typeinfo:
-#    4| [CopyAssignmentOperator] std::type_info& std::type_info::operator=(std::type_info const&)
-#    4|   <params>: 
-#-----|     getParameter(0): [Parameter] (unnamed parameter 0)
-#-----|         Type = [LValueReferenceType] const type_info &
-#    4| [MoveAssignmentOperator] std::type_info& std::type_info::operator=(std::type_info&&)
-#    4|   <params>: 
-#-----|     getParameter(0): [Parameter] (unnamed parameter 0)
-#-----|         Type = [RValueReferenceType] type_info &&
--- a/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
+++ b/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
@@ -20156,236 +20156,6 @@ ir.cpp:
 # 2724|     v2724_12(void)                      = AliasedUse                  : ~m2725_8
 # 2724|     v2724_13(void)                      = ExitFunction                : 

-# 2728| void test_postfix_crement(int*, int)
-# 2728|   Block 0
-# 2728|     v2728_1(void)         = EnterFunction            : 
-# 2728|     m2728_2(unknown)      = AliasedDefinition        : 
-# 2728|     m2728_3(unknown)      = InitializeNonLocal       : 
-# 2728|     m2728_4(unknown)      = Chi                      : total:m2728_2, partial:m2728_3
-# 2728|     r2728_5(glval<int *>) = VariableAddress[p]       : 
-# 2728|     m2728_6(int *)        = InitializeParameter[p]   : &:r2728_5
-# 2728|     r2728_7(int *)        = Load[p]                  : &:r2728_5, m2728_6
-# 2728|     m2728_8(unknown)      = InitializeIndirection[p] : &:r2728_7
-# 2728|     m2728_9(unknown)      = Chi                      : total:m2728_4, partial:m2728_8
-# 2728|     r2728_10(glval<int>)  = VariableAddress[q]       : 
-# 2728|     m2728_11(int)         = InitializeParameter[q]   : &:r2728_10
-# 2729|     r2729_1(glval<int *>) = VariableAddress[p]       : 
-# 2729|     r2729_2(int *)        = Load[p]                  : &:r2729_1, m2728_6
-# 2729|     r2729_3(int)          = Constant[1]              : 
-# 2729|     r2729_4(int *)        = PointerAdd[4]            : r2729_2, r2729_3
-# 2729|     m2729_5(int *)        = Store[p]                 : &:r2729_1, r2729_4
-# 2730|     r2730_1(glval<int>)   = VariableAddress[q]       : 
-# 2730|     r2730_2(int)          = Load[q]                  : &:r2730_1, m2728_11
-# 2730|     r2730_3(int)          = Constant[1]              : 
-# 2730|     r2730_4(int)          = Add                      : r2730_2, r2730_3
-# 2730|     m2730_5(int)          = Store[q]                 : &:r2730_1, r2730_4
-# 2731|     r2731_1(glval<int *>) = VariableAddress[p]       : 
-# 2731|     r2731_2(int *)        = Load[p]                  : &:r2731_1, m2729_5
-# 2731|     r2731_3(int)          = Constant[1]              : 
-# 2731|     r2731_4(int *)        = PointerAdd[4]            : r2731_2, r2731_3
-# 2731|     m2731_5(int *)        = Store[p]                 : &:r2731_1, r2731_4
-# 2731|     r2731_6(int *)        = CopyValue                : r2731_2
-# 2732|     r2732_1(glval<int>)   = VariableAddress[q]       : 
-# 2732|     r2732_2(int)          = Load[q]                  : &:r2732_1, m2730_5
-# 2732|     r2732_3(int)          = Constant[1]              : 
-# 2732|     r2732_4(int)          = Add                      : r2732_2, r2732_3
-# 2732|     m2732_5(int)          = Store[q]                 : &:r2732_1, r2732_4
-# 2732|     r2732_6(int)          = CopyValue                : r2732_2
-# 2733|     r2733_1(glval<int *>) = VariableAddress[p]       : 
-# 2733|     r2733_2(int *)        = Load[p]                  : &:r2733_1, m2731_5
-# 2733|     r2733_3(int)          = Constant[1]              : 
-# 2733|     r2733_4(int *)        = PointerAdd[4]            : r2733_2, r2733_3
-# 2733|     m2733_5(int *)        = Store[p]                 : &:r2733_1, r2733_4
-# 2733|     r2733_6(int *)        = CopyValue                : r2733_2
-# 2733|     v2733_7(void)         = Convert                  : r2733_6
-# 2734|     r2734_1(glval<int>)   = VariableAddress[q]       : 
-# 2734|     r2734_2(int)          = Load[q]                  : &:r2734_1, m2732_5
-# 2734|     r2734_3(int)          = Constant[1]              : 
-# 2734|     r2734_4(int)          = Add                      : r2734_2, r2734_3
-# 2734|     m2734_5(int)          = Store[q]                 : &:r2734_1, r2734_4
-# 2734|     r2734_6(int)          = CopyValue                : r2734_2
-# 2734|     v2734_7(void)         = Convert                  : r2734_6
-# 2735|     r2735_1(glval<int *>) = VariableAddress[p]       : 
-# 2735|     r2735_2(int *)        = Load[p]                  : &:r2735_1, m2733_5
-# 2735|     r2735_3(int)          = Constant[1]              : 
-# 2735|     r2735_4(int *)        = PointerAdd[4]            : r2735_2, r2735_3
-# 2735|     m2735_5(int *)        = Store[p]                 : &:r2735_1, r2735_4
-# 2735|     r2735_6(int *)        = CopyValue                : r2735_2
-# 2735|     v2735_7(void)         = Convert                  : r2735_6
-# 2736|     r2736_1(glval<int>)   = VariableAddress[q]       : 
-# 2736|     r2736_2(int)          = Load[q]                  : &:r2736_1, m2734_5
-# 2736|     r2736_3(int)          = Constant[1]              : 
-# 2736|     r2736_4(int)          = Add                      : r2736_2, r2736_3
-# 2736|     m2736_5(int)          = Store[q]                 : &:r2736_1, r2736_4
-# 2736|     r2736_6(int)          = CopyValue                : r2736_2
-# 2736|     v2736_7(void)         = Convert                  : r2736_6
-# 2737|     r2737_1(glval<int *>) = VariableAddress[p1]      : 
-# 2737|     r2737_2(glval<int *>) = VariableAddress[p]       : 
-# 2737|     r2737_3(int *)        = Load[p]                  : &:r2737_2, m2735_5
-# 2737|     r2737_4(int)          = Constant[1]              : 
-# 2737|     r2737_5(int *)        = PointerAdd[4]            : r2737_3, r2737_4
-# 2737|     m2737_6(int *)        = Store[p]                 : &:r2737_2, r2737_5
-# 2737|     r2737_7(int *)        = CopyValue                : r2737_3
-# 2737|     m2737_8(int *)        = Store[p1]                : &:r2737_1, r2737_7
-# 2738|     r2738_1(glval<int>)   = VariableAddress[q1]      : 
-# 2738|     r2738_2(glval<int>)   = VariableAddress[q]       : 
-# 2738|     r2738_3(int)          = Load[q]                  : &:r2738_2, m2736_5
-# 2738|     r2738_4(int)          = Constant[1]              : 
-# 2738|     r2738_5(int)          = Add                      : r2738_3, r2738_4
-# 2738|     m2738_6(int)          = Store[q]                 : &:r2738_2, r2738_5
-# 2738|     r2738_7(int)          = CopyValue                : r2738_3
-# 2738|     m2738_8(int)          = Store[q1]                : &:r2738_1, r2738_7
-# 2739|     r2739_1(glval<int *>) = VariableAddress[p]       : 
-# 2739|     r2739_2(int *)        = Load[p]                  : &:r2739_1, m2737_6
-# 2739|     r2739_3(int)          = Constant[1]              : 
-# 2739|     r2739_4(int *)        = PointerAdd[4]            : r2739_2, r2739_3
-# 2739|     m2739_5(int *)        = Store[p]                 : &:r2739_1, r2739_4
-# 2739|     r2739_6(int *)        = CopyValue                : r2739_2
-# 2739|     r2739_7(int *)        = Convert                  : r2739_6
-# 2740|     r2740_1(glval<int>)   = VariableAddress[q]       : 
-# 2740|     r2740_2(int)          = Load[q]                  : &:r2740_1, m2738_6
-# 2740|     r2740_3(int)          = Constant[1]              : 
-# 2740|     r2740_4(int)          = Add                      : r2740_2, r2740_3
-# 2740|     m2740_5(int)          = Store[q]                 : &:r2740_1, r2740_4
-# 2740|     r2740_6(int)          = CopyValue                : r2740_2
-# 2740|     r2740_7(int)          = Convert                  : r2740_6
-# 2741|     r2741_1(glval<int *>) = VariableAddress[p2]      : 
-# 2741|     r2741_2(glval<int *>) = VariableAddress[p]       : 
-# 2741|     r2741_3(int *)        = Load[p]                  : &:r2741_2, m2739_5
-# 2741|     r2741_4(int)          = Constant[1]              : 
-# 2741|     r2741_5(int *)        = PointerAdd[4]            : r2741_3, r2741_4
-# 2741|     m2741_6(int *)        = Store[p]                 : &:r2741_2, r2741_5
-# 2741|     r2741_7(int *)        = CopyValue                : r2741_3
-# 2741|     r2741_8(int *)        = Convert                  : r2741_7
-# 2741|     m2741_9(int *)        = Store[p2]                : &:r2741_1, r2741_8
-# 2742|     r2742_1(glval<int>)   = VariableAddress[q2]      : 
-# 2742|     r2742_2(glval<int>)   = VariableAddress[q]       : 
-# 2742|     r2742_3(int)          = Load[q]                  : &:r2742_2, m2740_5
-# 2742|     r2742_4(int)          = Constant[1]              : 
-# 2742|     r2742_5(int)          = Add                      : r2742_3, r2742_4
-# 2742|     m2742_6(int)          = Store[q]                 : &:r2742_2, r2742_5
-# 2742|     r2742_7(int)          = CopyValue                : r2742_3
-# 2742|     r2742_8(int)          = Convert                  : r2742_7
-# 2742|     m2742_9(int)          = Store[q2]                : &:r2742_1, r2742_8
-# 2743|     v2743_1(void)         = NoOp                     : 
-# 2728|     v2728_12(void)        = ReturnIndirection[p]     : &:r2728_7, m2728_8
-# 2728|     v2728_13(void)        = ReturnVoid               : 
-# 2728|     v2728_14(void)        = AliasedUse               : ~m2728_9
-# 2728|     v2728_15(void)        = ExitFunction             : 
-
-# 2747| void std::strong_ordering::strong_ordering(std::strong_ordering&&)
-# 2747|   Block 0
-# 2747|     v2747_1(void)                   = EnterFunction                                : 
-# 2747|     m2747_2(unknown)                = AliasedDefinition                            : 
-# 2747|     m2747_3(unknown)                = InitializeNonLocal                           : 
-# 2747|     m2747_4(unknown)                = Chi                                          : total:m2747_2, partial:m2747_3
-# 2747|     r2747_5(glval<unknown>)         = VariableAddress[#this]                       : 
-# 2747|     m2747_6(glval<strong_ordering>) = InitializeParameter[#this]                   : &:r2747_5
-# 2747|     r2747_7(glval<strong_ordering>) = Load[#this]                                  : &:r2747_5, m2747_6
-# 2747|     m2747_8(strong_ordering)        = InitializeIndirection[#this]                 : &:r2747_7
-#-----|     r0_1(glval<strong_ordering &&>) = VariableAddress[(unnamed parameter 0)]       : 
-#-----|     m0_2(strong_ordering &&)        = InitializeParameter[(unnamed parameter 0)]   : &:r0_1
-#-----|     r0_3(strong_ordering &&)        = Load[(unnamed parameter 0)]                  : &:r0_1, m0_2
-#-----|     m0_4(unknown)                   = InitializeIndirection[(unnamed parameter 0)] : &:r0_3
-# 2747|     v2747_9(void)                   = NoOp                                         : 
-# 2747|     v2747_10(void)                  = ReturnIndirection[#this]                     : &:r2747_7, m2747_8
-#-----|     v0_5(void)                      = ReturnIndirection[(unnamed parameter 0)]     : &:r0_3, m0_4
-# 2747|     v2747_11(void)                  = ReturnVoid                                   : 
-# 2747|     v2747_12(void)                  = AliasedUse                                   : m2747_3
-# 2747|     v2747_13(void)                  = ExitFunction                                 : 
-
-# 2748| void std::strong_ordering::strong_ordering(std::_Order)
-# 2748|   Block 0
-# 2748|     v2748_1(void)                   = EnterFunction                : 
-# 2748|     m2748_2(unknown)                = AliasedDefinition            : 
-# 2748|     m2748_3(unknown)                = InitializeNonLocal           : 
-# 2748|     m2748_4(unknown)                = Chi                          : total:m2748_2, partial:m2748_3
-# 2748|     r2748_5(glval<unknown>)         = VariableAddress[#this]       : 
-# 2748|     m2748_6(glval<strong_ordering>) = InitializeParameter[#this]   : &:r2748_5
-# 2748|     r2748_7(glval<strong_ordering>) = Load[#this]                  : &:r2748_5, m2748_6
-# 2748|     m2748_8(strong_ordering)        = InitializeIndirection[#this] : &:r2748_7
-# 2748|     r2748_9(glval<_Order>)          = VariableAddress[v]           : 
-# 2748|     m2748_10(_Order)                = InitializeParameter[v]       : &:r2748_9
-# 2748|     v2748_11(void)                  = NoOp                         : 
-# 2748|     v2748_12(void)                  = ReturnIndirection[#this]     : &:r2748_7, m2748_8
-# 2748|     v2748_13(void)                  = ReturnVoid                   : 
-# 2748|     v2748_14(void)                  = AliasedUse                   : m2748_3
-# 2748|     v2748_15(void)                  = ExitFunction                 : 
-
-# 2766| std::strong_ordering ThreeWay::operator<=>(ThreeWay&)
-# 2766|   Block 0
-# 2766|     v2766_1(void)                    = EnterFunction                : 
-# 2766|     m2766_2(unknown)                 = AliasedDefinition            : 
-# 2766|     m2766_3(unknown)                 = InitializeNonLocal           : 
-# 2766|     m2766_4(unknown)                 = Chi                          : total:m2766_2, partial:m2766_3
-# 2766|     r2766_5(glval<unknown>)          = VariableAddress[#this]       : 
-# 2766|     m2766_6(glval<ThreeWay>)         = InitializeParameter[#this]   : &:r2766_5
-# 2766|     r2766_7(glval<ThreeWay>)         = Load[#this]                  : &:r2766_5, m2766_6
-# 2766|     m2766_8(ThreeWay)                = InitializeIndirection[#this] : &:r2766_7
-# 2766|     r2766_9(glval<ThreeWay &>)       = VariableAddress[y]           : 
-# 2766|     m2766_10(ThreeWay &)             = InitializeParameter[y]       : &:r2766_9
-# 2766|     r2766_11(ThreeWay &)             = Load[y]                      : &:r2766_9, m2766_10
-# 2766|     m2766_12(unknown)                = InitializeIndirection[y]     : &:r2766_11
-# 2766|     r2766_13(glval<strong_ordering>) = VariableAddress[#return]     : 
-# 2766|     r2766_14(glval<unknown>)         = VariableAddress[#this]       : 
-# 2766|     r2766_15(ThreeWay *)             = Load[#this]                  : &:r2766_14, m2766_6
-# 2766|     r2766_16(glval<int>)             = FieldAddress[x]              : r2766_15
-# 2766|     r2766_17(int)                    = Load[?]                      : &:r2766_16, ~m2766_8
-# 2766|     r2766_18(glval<ThreeWay &>)      = VariableAddress[y]           : 
-# 2766|     r2766_19(ThreeWay &)             = Load[y]                      : &:r2766_18, m2766_10
-# 2766|     r2766_20(glval<ThreeWay>)        = CopyValue                    : r2766_19
-# 2766|     r2766_21(glval<int>)             = FieldAddress[x]              : r2766_20
-# 2766|     r2766_22(int)                    = Load[?]                      : &:r2766_21, ~m2766_12
-# 2766|     r2766_23(strong_ordering)        = Spaceship                    : r2766_17, r2766_22
-# 2766|     m2766_24(strong_ordering)        = Store[#return]               : &:r2766_13, r2766_23
-# 2766|     v2766_25(void)                   = ReturnIndirection[#this]     : &:r2766_7, m2766_8
-# 2766|     v2766_26(void)                   = ReturnIndirection[y]         : &:r2766_11, m2766_12
-# 2766|     r2766_27(glval<strong_ordering>) = VariableAddress[#return]     : 
-# 2766|     v2766_28(void)                   = ReturnValue                  : &:r2766_27, m2766_24
-# 2766|     v2766_29(void)                   = AliasedUse                   : m2766_3
-# 2766|     v2766_30(void)                   = ExitFunction                 : 
-
-# 2769| void test_three_way(int, int, ThreeWay, ThreeWay)
-# 2769|   Block 0
-# 2769|     v2769_1(void)                   = EnterFunction                   : 
-# 2769|     m2769_2(unknown)                = AliasedDefinition               : 
-# 2769|     m2769_3(unknown)                = InitializeNonLocal              : 
-# 2769|     m2769_4(unknown)                = Chi                             : total:m2769_2, partial:m2769_3
-# 2769|     r2769_5(glval<int>)             = VariableAddress[a]              : 
-# 2769|     m2769_6(int)                    = InitializeParameter[a]          : &:r2769_5
-# 2769|     r2769_7(glval<int>)             = VariableAddress[b]              : 
-# 2769|     m2769_8(int)                    = InitializeParameter[b]          : &:r2769_7
-# 2769|     r2769_9(glval<ThreeWay>)        = VariableAddress[c]              : 
-# 2769|     m2769_10(ThreeWay)              = InitializeParameter[c]          : &:r2769_9
-# 2769|     r2769_11(glval<ThreeWay>)       = VariableAddress[d]              : 
-# 2769|     m2769_12(ThreeWay)              = InitializeParameter[d]          : &:r2769_11
-# 2770|     r2770_1(glval<strong_ordering>) = VariableAddress[x]              : 
-# 2770|     r2770_2(glval<int>)             = VariableAddress[a]              : 
-# 2770|     r2770_3(int)                    = Load[a]                         : &:r2770_2, m2769_6
-# 2770|     r2770_4(glval<int>)             = VariableAddress[b]              : 
-# 2770|     r2770_5(int)                    = Load[b]                         : &:r2770_4, m2769_8
-# 2770|     r2770_6(strong_ordering)        = Spaceship                       : r2770_3, r2770_5
-# 2770|     m2770_7(strong_ordering)        = Store[x]                        : &:r2770_1, r2770_6
-# 2771|     r2771_1(glval<strong_ordering>) = VariableAddress[y]              : 
-# 2771|     r2771_2(glval<ThreeWay>)        = VariableAddress[c]              : 
-# 2771|     r2771_3(glval<unknown>)         = FunctionAddress[operator<=>]    : 
-# 2771|     r2771_4(glval<ThreeWay>)        = VariableAddress[d]              : 
-# 2771|     r2771_5(ThreeWay &)             = CopyValue                       : r2771_4
-# 2771|     r2771_6(strong_ordering)        = Call[operator<=>]               : func:r2771_3, this:r2771_2, 0:r2771_5
-# 2771|     m2771_7(unknown)                = ^CallSideEffect                 : ~m2769_4
-# 2771|     m2771_8(unknown)                = Chi                             : total:m2769_4, partial:m2771_7
-# 2771|     v2771_9(void)                   = ^IndirectReadSideEffect[-1]     : &:r2771_2, m2769_10
-# 2771|     v2771_10(void)                  = ^BufferReadSideEffect[0]        : &:r2771_5, ~m2769_12
-# 2771|     m2771_11(ThreeWay)              = ^IndirectMayWriteSideEffect[-1] : &:r2771_2
-# 2771|     m2771_12(ThreeWay)              = Chi                             : total:m2769_10, partial:m2771_11
-# 2771|     m2771_13(unknown)               = ^BufferMayWriteSideEffect[0]    : &:r2771_5
-# 2771|     m2771_14(ThreeWay)              = Chi                             : total:m2769_12, partial:m2771_13
-# 2771|     m2771_15(strong_ordering)       = Store[y]                        : &:r2771_1, r2771_6
-# 2772|     v2772_1(void)                   = NoOp                            : 
-# 2769|     v2769_13(void)                  = ReturnVoid                      : 
-# 2769|     v2769_14(void)                  = AliasedUse                      : ~m2771_8
-# 2769|     v2769_15(void)                  = ExitFunction                    : 
-
 ir23.cpp:
 #    1| bool consteval_1()
 #    1|   Block 0
@@ -40086,27 +39856,3 @@ try_except.cpp:

 #   44|   Block 7
 #   44|     v44_10(void) = Unreached : 
-
-type_info_test.cpp:
-#    3| void type_info_test(int)
-#    3|   Block 0
-#    3|     v3_1(void)               = EnterFunction          : 
-#    3|     m3_2(unknown)            = AliasedDefinition      : 
-#    3|     m3_3(unknown)            = InitializeNonLocal     : 
-#    3|     m3_4(unknown)            = Chi                    : total:m3_2, partial:m3_3
-#    3|     r3_5(glval<int>)         = VariableAddress[x]     : 
-#    3|     m3_6(int)                = InitializeParameter[x] : &:r3_5
-#    3|     m3_7(unknown)            = Chi                    : total:m3_4, partial:m3_6
-#    4|     r4_1(glval<type_info &>) = VariableAddress[t1]    : 
-#    4|     r4_2(glval<int>)         = VariableAddress[x]     : 
-#    4|     r4_3(glval<type_info>)   = TypeidExpr             : r4_2
-#    4|     r4_4(type_info &)        = CopyValue              : r4_3
-#    4|     m4_5(type_info &)        = Store[t1]              : &:r4_1, r4_4
-#    5|     r5_1(glval<type_info &>) = VariableAddress[t2]    : 
-#    5|     r5_2(glval<type_info>)   = TypeidType             : 
-#    5|     r5_3(type_info &)        = CopyValue              : r5_2
-#    5|     m5_4(type_info &)        = Store[t2]              : &:r5_1, r5_3
-#    6|     v6_1(void)               = NoOp                   : 
-#    3|     v3_8(void)               = ReturnVoid             : 
-#    3|     v3_9(void)               = AliasedUse             : m3_3
-#    3|     v3_10(void)              = ExitFunction           : 
--- a/cpp/ql/test/library-tests/ir/ir/ir.cpp
+++ b/cpp/ql/test/library-tests/ir/ir/ir.cpp
@@ -2725,50 +2725,4 @@ char UseBracketOperator(const WithBracketOperator x, int i) {
  return x[i];
 }

-void test_postfix_crement(int *p, int q) {
-  p++;
-  q++;
-  (p++);
-  (q++);
-  (void)(p++);
-  (void)(q++);
-  (void)p++;
-  (void)q++;
-  int *p1 = p++;
-  int q1 = q++;
-  (int*)(p++);
-  (int)(q++);
-  int *p2 = (int*)(p++);
-  int q2 = (int)(q++);
-}
-
-namespace std {
-  enum class _Order : signed char { __less = -1, __equiv = 0, __greater = 1 };
-  class strong_ordering {
-    explicit constexpr strong_ordering(_Order v)  {}
-        
-  public:
-    static const strong_ordering less;
-    static const strong_ordering equal;
-    static const strong_ordering equivalent;
-    static const strong_ordering greater;
-  };
-
-  inline constexpr strong_ordering strong_ordering::less(_Order::__less);
-  inline constexpr strong_ordering strong_ordering::equal(_Order::__equiv);
-  inline constexpr strong_ordering strong_ordering::equivalent(_Order::__equiv);
-  inline constexpr strong_ordering strong_ordering::greater(_Order::__greater);
-}
-
-class ThreeWay {
-  int x;
-public:
-  std::strong_ordering operator<=>(ThreeWay &y) { return this->x <=> y.x; }
-};
-
-void test_three_way(int a, int b, ThreeWay c, ThreeWay d) {
-  auto x = a <=> b;
-  auto y = c <=> d;
-}
-
 // semmle-extractor-options: -std=c++20 --clang
--- a/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
+++ b/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
@@ -18317,227 +18317,6 @@ ir.cpp:
 # 2724|     v2724_10(void)                      = AliasedUse                  : ~m?
 # 2724|     v2724_11(void)                      = ExitFunction                : 

-# 2728| void test_postfix_crement(int*, int)
-# 2728|   Block 0
-# 2728|     v2728_1(void)         = EnterFunction            : 
-# 2728|     mu2728_2(unknown)     = AliasedDefinition        : 
-# 2728|     mu2728_3(unknown)     = InitializeNonLocal       : 
-# 2728|     r2728_4(glval<int *>) = VariableAddress[p]       : 
-# 2728|     mu2728_5(int *)       = InitializeParameter[p]   : &:r2728_4
-# 2728|     r2728_6(int *)        = Load[p]                  : &:r2728_4, ~m?
-# 2728|     mu2728_7(unknown)     = InitializeIndirection[p] : &:r2728_6
-# 2728|     r2728_8(glval<int>)   = VariableAddress[q]       : 
-# 2728|     mu2728_9(int)         = InitializeParameter[q]   : &:r2728_8
-# 2729|     r2729_1(glval<int *>) = VariableAddress[p]       : 
-# 2729|     r2729_2(int *)        = Load[p]                  : &:r2729_1, ~m?
-# 2729|     r2729_3(int)          = Constant[1]              : 
-# 2729|     r2729_4(int *)        = PointerAdd[4]            : r2729_2, r2729_3
-# 2729|     mu2729_5(int *)       = Store[p]                 : &:r2729_1, r2729_4
-# 2730|     r2730_1(glval<int>)   = VariableAddress[q]       : 
-# 2730|     r2730_2(int)          = Load[q]                  : &:r2730_1, ~m?
-# 2730|     r2730_3(int)          = Constant[1]              : 
-# 2730|     r2730_4(int)          = Add                      : r2730_2, r2730_3
-# 2730|     mu2730_5(int)         = Store[q]                 : &:r2730_1, r2730_4
-# 2731|     r2731_1(glval<int *>) = VariableAddress[p]       : 
-# 2731|     r2731_2(int *)        = Load[p]                  : &:r2731_1, ~m?
-# 2731|     r2731_3(int)          = Constant[1]              : 
-# 2731|     r2731_4(int *)        = PointerAdd[4]            : r2731_2, r2731_3
-# 2731|     mu2731_5(int *)       = Store[p]                 : &:r2731_1, r2731_4
-# 2731|     r2731_6(int *)        = CopyValue                : r2731_2
-# 2732|     r2732_1(glval<int>)   = VariableAddress[q]       : 
-# 2732|     r2732_2(int)          = Load[q]                  : &:r2732_1, ~m?
-# 2732|     r2732_3(int)          = Constant[1]              : 
-# 2732|     r2732_4(int)          = Add                      : r2732_2, r2732_3
-# 2732|     mu2732_5(int)         = Store[q]                 : &:r2732_1, r2732_4
-# 2732|     r2732_6(int)          = CopyValue                : r2732_2
-# 2733|     r2733_1(glval<int *>) = VariableAddress[p]       : 
-# 2733|     r2733_2(int *)        = Load[p]                  : &:r2733_1, ~m?
-# 2733|     r2733_3(int)          = Constant[1]              : 
-# 2733|     r2733_4(int *)        = PointerAdd[4]            : r2733_2, r2733_3
-# 2733|     mu2733_5(int *)       = Store[p]                 : &:r2733_1, r2733_4
-# 2733|     r2733_6(int *)        = CopyValue                : r2733_2
-# 2733|     v2733_7(void)         = Convert                  : r2733_6
-# 2734|     r2734_1(glval<int>)   = VariableAddress[q]       : 
-# 2734|     r2734_2(int)          = Load[q]                  : &:r2734_1, ~m?
-# 2734|     r2734_3(int)          = Constant[1]              : 
-# 2734|     r2734_4(int)          = Add                      : r2734_2, r2734_3
-# 2734|     mu2734_5(int)         = Store[q]                 : &:r2734_1, r2734_4
-# 2734|     r2734_6(int)          = CopyValue                : r2734_2
-# 2734|     v2734_7(void)         = Convert                  : r2734_6
-# 2735|     r2735_1(glval<int *>) = VariableAddress[p]       : 
-# 2735|     r2735_2(int *)        = Load[p]                  : &:r2735_1, ~m?
-# 2735|     r2735_3(int)          = Constant[1]              : 
-# 2735|     r2735_4(int *)        = PointerAdd[4]            : r2735_2, r2735_3
-# 2735|     mu2735_5(int *)       = Store[p]                 : &:r2735_1, r2735_4
-# 2735|     r2735_6(int *)        = CopyValue                : r2735_2
-# 2735|     v2735_7(void)         = Convert                  : r2735_6
-# 2736|     r2736_1(glval<int>)   = VariableAddress[q]       : 
-# 2736|     r2736_2(int)          = Load[q]                  : &:r2736_1, ~m?
-# 2736|     r2736_3(int)          = Constant[1]              : 
-# 2736|     r2736_4(int)          = Add                      : r2736_2, r2736_3
-# 2736|     mu2736_5(int)         = Store[q]                 : &:r2736_1, r2736_4
-# 2736|     r2736_6(int)          = CopyValue                : r2736_2
-# 2736|     v2736_7(void)         = Convert                  : r2736_6
-# 2737|     r2737_1(glval<int *>) = VariableAddress[p1]      : 
-# 2737|     r2737_2(glval<int *>) = VariableAddress[p]       : 
-# 2737|     r2737_3(int *)        = Load[p]                  : &:r2737_2, ~m?
-# 2737|     r2737_4(int)          = Constant[1]              : 
-# 2737|     r2737_5(int *)        = PointerAdd[4]            : r2737_3, r2737_4
-# 2737|     mu2737_6(int *)       = Store[p]                 : &:r2737_2, r2737_5
-# 2737|     r2737_7(int *)        = CopyValue                : r2737_3
-# 2737|     mu2737_8(int *)       = Store[p1]                : &:r2737_1, r2737_7
-# 2738|     r2738_1(glval<int>)   = VariableAddress[q1]      : 
-# 2738|     r2738_2(glval<int>)   = VariableAddress[q]       : 
-# 2738|     r2738_3(int)          = Load[q]                  : &:r2738_2, ~m?
-# 2738|     r2738_4(int)          = Constant[1]              : 
-# 2738|     r2738_5(int)          = Add                      : r2738_3, r2738_4
-# 2738|     mu2738_6(int)         = Store[q]                 : &:r2738_2, r2738_5
-# 2738|     r2738_7(int)          = CopyValue                : r2738_3
-# 2738|     mu2738_8(int)         = Store[q1]                : &:r2738_1, r2738_7
-# 2739|     r2739_1(glval<int *>) = VariableAddress[p]       : 
-# 2739|     r2739_2(int *)        = Load[p]                  : &:r2739_1, ~m?
-# 2739|     r2739_3(int)          = Constant[1]              : 
-# 2739|     r2739_4(int *)        = PointerAdd[4]            : r2739_2, r2739_3
-# 2739|     mu2739_5(int *)       = Store[p]                 : &:r2739_1, r2739_4
-# 2739|     r2739_6(int *)        = CopyValue                : r2739_2
-# 2739|     r2739_7(int *)        = Convert                  : r2739_6
-# 2740|     r2740_1(glval<int>)   = VariableAddress[q]       : 
-# 2740|     r2740_2(int)          = Load[q]                  : &:r2740_1, ~m?
-# 2740|     r2740_3(int)          = Constant[1]              : 
-# 2740|     r2740_4(int)          = Add                      : r2740_2, r2740_3
-# 2740|     mu2740_5(int)         = Store[q]                 : &:r2740_1, r2740_4
-# 2740|     r2740_6(int)          = CopyValue                : r2740_2
-# 2740|     r2740_7(int)          = Convert                  : r2740_6
-# 2741|     r2741_1(glval<int *>) = VariableAddress[p2]      : 
-# 2741|     r2741_2(glval<int *>) = VariableAddress[p]       : 
-# 2741|     r2741_3(int *)        = Load[p]                  : &:r2741_2, ~m?
-# 2741|     r2741_4(int)          = Constant[1]              : 
-# 2741|     r2741_5(int *)        = PointerAdd[4]            : r2741_3, r2741_4
-# 2741|     mu2741_6(int *)       = Store[p]                 : &:r2741_2, r2741_5
-# 2741|     r2741_7(int *)        = CopyValue                : r2741_3
-# 2741|     r2741_8(int *)        = Convert                  : r2741_7
-# 2741|     mu2741_9(int *)       = Store[p2]                : &:r2741_1, r2741_8
-# 2742|     r2742_1(glval<int>)   = VariableAddress[q2]      : 
-# 2742|     r2742_2(glval<int>)   = VariableAddress[q]       : 
-# 2742|     r2742_3(int)          = Load[q]                  : &:r2742_2, ~m?
-# 2742|     r2742_4(int)          = Constant[1]              : 
-# 2742|     r2742_5(int)          = Add                      : r2742_3, r2742_4
-# 2742|     mu2742_6(int)         = Store[q]                 : &:r2742_2, r2742_5
-# 2742|     r2742_7(int)          = CopyValue                : r2742_3
-# 2742|     r2742_8(int)          = Convert                  : r2742_7
-# 2742|     mu2742_9(int)         = Store[q2]                : &:r2742_1, r2742_8
-# 2743|     v2743_1(void)         = NoOp                     : 
-# 2728|     v2728_10(void)        = ReturnIndirection[p]     : &:r2728_6, ~m?
-# 2728|     v2728_11(void)        = ReturnVoid               : 
-# 2728|     v2728_12(void)        = AliasedUse               : ~m?
-# 2728|     v2728_13(void)        = ExitFunction             : 
-
-# 2747| void std::strong_ordering::strong_ordering(std::strong_ordering&&)
-# 2747|   Block 0
-# 2747|     v2747_1(void)                    = EnterFunction                                : 
-# 2747|     mu2747_2(unknown)                = AliasedDefinition                            : 
-# 2747|     mu2747_3(unknown)                = InitializeNonLocal                           : 
-# 2747|     r2747_4(glval<unknown>)          = VariableAddress[#this]                       : 
-# 2747|     mu2747_5(glval<strong_ordering>) = InitializeParameter[#this]                   : &:r2747_4
-# 2747|     r2747_6(glval<strong_ordering>)  = Load[#this]                                  : &:r2747_4, ~m?
-# 2747|     mu2747_7(strong_ordering)        = InitializeIndirection[#this]                 : &:r2747_6
-#-----|     r0_1(glval<strong_ordering &&>)  = VariableAddress[(unnamed parameter 0)]       : 
-#-----|     mu0_2(strong_ordering &&)        = InitializeParameter[(unnamed parameter 0)]   : &:r0_1
-#-----|     r0_3(strong_ordering &&)         = Load[(unnamed parameter 0)]                  : &:r0_1, ~m?
-#-----|     mu0_4(unknown)                   = InitializeIndirection[(unnamed parameter 0)] : &:r0_3
-# 2747|     v2747_8(void)                    = NoOp                                         : 
-# 2747|     v2747_9(void)                    = ReturnIndirection[#this]                     : &:r2747_6, ~m?
-#-----|     v0_5(void)                       = ReturnIndirection[(unnamed parameter 0)]     : &:r0_3, ~m?
-# 2747|     v2747_10(void)                   = ReturnVoid                                   : 
-# 2747|     v2747_11(void)                   = AliasedUse                                   : ~m?
-# 2747|     v2747_12(void)                   = ExitFunction                                 : 
-
-# 2748| void std::strong_ordering::strong_ordering(std::_Order)
-# 2748|   Block 0
-# 2748|     v2748_1(void)                    = EnterFunction                : 
-# 2748|     mu2748_2(unknown)                = AliasedDefinition            : 
-# 2748|     mu2748_3(unknown)                = InitializeNonLocal           : 
-# 2748|     r2748_4(glval<unknown>)          = VariableAddress[#this]       : 
-# 2748|     mu2748_5(glval<strong_ordering>) = InitializeParameter[#this]   : &:r2748_4
-# 2748|     r2748_6(glval<strong_ordering>)  = Load[#this]                  : &:r2748_4, ~m?
-# 2748|     mu2748_7(strong_ordering)        = InitializeIndirection[#this] : &:r2748_6
-# 2748|     r2748_8(glval<_Order>)           = VariableAddress[v]           : 
-# 2748|     mu2748_9(_Order)                 = InitializeParameter[v]       : &:r2748_8
-# 2748|     v2748_10(void)                   = NoOp                         : 
-# 2748|     v2748_11(void)                   = ReturnIndirection[#this]     : &:r2748_6, ~m?
-# 2748|     v2748_12(void)                   = ReturnVoid                   : 
-# 2748|     v2748_13(void)                   = AliasedUse                   : ~m?
-# 2748|     v2748_14(void)                   = ExitFunction                 : 
-
-# 2766| std::strong_ordering ThreeWay::operator<=>(ThreeWay&)
-# 2766|   Block 0
-# 2766|     v2766_1(void)                    = EnterFunction                : 
-# 2766|     mu2766_2(unknown)                = AliasedDefinition            : 
-# 2766|     mu2766_3(unknown)                = InitializeNonLocal           : 
-# 2766|     r2766_4(glval<unknown>)          = VariableAddress[#this]       : 
-# 2766|     mu2766_5(glval<ThreeWay>)        = InitializeParameter[#this]   : &:r2766_4
-# 2766|     r2766_6(glval<ThreeWay>)         = Load[#this]                  : &:r2766_4, ~m?
-# 2766|     mu2766_7(ThreeWay)               = InitializeIndirection[#this] : &:r2766_6
-# 2766|     r2766_8(glval<ThreeWay &>)       = VariableAddress[y]           : 
-# 2766|     mu2766_9(ThreeWay &)             = InitializeParameter[y]       : &:r2766_8
-# 2766|     r2766_10(ThreeWay &)             = Load[y]                      : &:r2766_8, ~m?
-# 2766|     mu2766_11(unknown)               = InitializeIndirection[y]     : &:r2766_10
-# 2766|     r2766_12(glval<strong_ordering>) = VariableAddress[#return]     : 
-# 2766|     r2766_13(glval<unknown>)         = VariableAddress[#this]       : 
-# 2766|     r2766_14(ThreeWay *)             = Load[#this]                  : &:r2766_13, ~m?
-# 2766|     r2766_15(glval<int>)             = FieldAddress[x]              : r2766_14
-# 2766|     r2766_16(int)                    = Load[?]                      : &:r2766_15, ~m?
-# 2766|     r2766_17(glval<ThreeWay &>)      = VariableAddress[y]           : 
-# 2766|     r2766_18(ThreeWay &)             = Load[y]                      : &:r2766_17, ~m?
-# 2766|     r2766_19(glval<ThreeWay>)        = CopyValue                    : r2766_18
-# 2766|     r2766_20(glval<int>)             = FieldAddress[x]              : r2766_19
-# 2766|     r2766_21(int)                    = Load[?]                      : &:r2766_20, ~m?
-# 2766|     r2766_22(strong_ordering)        = Spaceship                    : r2766_16, r2766_21
-# 2766|     mu2766_23(strong_ordering)       = Store[#return]               : &:r2766_12, r2766_22
-# 2766|     v2766_24(void)                   = ReturnIndirection[#this]     : &:r2766_6, ~m?
-# 2766|     v2766_25(void)                   = ReturnIndirection[y]         : &:r2766_10, ~m?
-# 2766|     r2766_26(glval<strong_ordering>) = VariableAddress[#return]     : 
-# 2766|     v2766_27(void)                   = ReturnValue                  : &:r2766_26, ~m?
-# 2766|     v2766_28(void)                   = AliasedUse                   : ~m?
-# 2766|     v2766_29(void)                   = ExitFunction                 : 
-
-# 2769| void test_three_way(int, int, ThreeWay, ThreeWay)
-# 2769|   Block 0
-# 2769|     v2769_1(void)                   = EnterFunction                   : 
-# 2769|     mu2769_2(unknown)               = AliasedDefinition               : 
-# 2769|     mu2769_3(unknown)               = InitializeNonLocal              : 
-# 2769|     r2769_4(glval<int>)             = VariableAddress[a]              : 
-# 2769|     mu2769_5(int)                   = InitializeParameter[a]          : &:r2769_4
-# 2769|     r2769_6(glval<int>)             = VariableAddress[b]              : 
-# 2769|     mu2769_7(int)                   = InitializeParameter[b]          : &:r2769_6
-# 2769|     r2769_8(glval<ThreeWay>)        = VariableAddress[c]              : 
-# 2769|     mu2769_9(ThreeWay)              = InitializeParameter[c]          : &:r2769_8
-# 2769|     r2769_10(glval<ThreeWay>)       = VariableAddress[d]              : 
-# 2769|     mu2769_11(ThreeWay)             = InitializeParameter[d]          : &:r2769_10
-# 2770|     r2770_1(glval<strong_ordering>) = VariableAddress[x]              : 
-# 2770|     r2770_2(glval<int>)             = VariableAddress[a]              : 
-# 2770|     r2770_3(int)                    = Load[a]                         : &:r2770_2, ~m?
-# 2770|     r2770_4(glval<int>)             = VariableAddress[b]              : 
-# 2770|     r2770_5(int)                    = Load[b]                         : &:r2770_4, ~m?
-# 2770|     r2770_6(strong_ordering)        = Spaceship                       : r2770_3, r2770_5
-# 2770|     mu2770_7(strong_ordering)       = Store[x]                        : &:r2770_1, r2770_6
-# 2771|     r2771_1(glval<strong_ordering>) = VariableAddress[y]              : 
-# 2771|     r2771_2(glval<ThreeWay>)        = VariableAddress[c]              : 
-# 2771|     r2771_3(glval<unknown>)         = FunctionAddress[operator<=>]    : 
-# 2771|     r2771_4(glval<ThreeWay>)        = VariableAddress[d]              : 
-# 2771|     r2771_5(ThreeWay &)             = CopyValue                       : r2771_4
-# 2771|     r2771_6(strong_ordering)        = Call[operator<=>]               : func:r2771_3, this:r2771_2, 0:r2771_5
-# 2771|     mu2771_7(unknown)               = ^CallSideEffect                 : ~m?
-# 2771|     v2771_8(void)                   = ^IndirectReadSideEffect[-1]     : &:r2771_2, ~m?
-# 2771|     v2771_9(void)                   = ^BufferReadSideEffect[0]        : &:r2771_5, ~m?
-# 2771|     mu2771_10(ThreeWay)             = ^IndirectMayWriteSideEffect[-1] : &:r2771_2
-# 2771|     mu2771_11(unknown)              = ^BufferMayWriteSideEffect[0]    : &:r2771_5
-# 2771|     mu2771_12(strong_ordering)      = Store[y]                        : &:r2771_1, r2771_6
-# 2772|     v2772_1(void)                   = NoOp                            : 
-# 2769|     v2769_12(void)                  = ReturnVoid                      : 
-# 2769|     v2769_13(void)                  = AliasedUse                      : ~m?
-# 2769|     v2769_14(void)                  = ExitFunction                    : 
-
 ir23.cpp:
 #    1| bool consteval_1()
 #    1|   Block 0
@@ -38208,25 +37987,3 @@ try_except.cpp:
 #   54|     v54_1(void) = NoOp       : 
 #   44|     v44_9(void) = ReturnVoid : 
 #-----|   Goto -> Block 1
-
-type_info_test.cpp:
-#    3| void type_info_test(int)
-#    3|   Block 0
-#    3|     v3_1(void)               = EnterFunction          : 
-#    3|     mu3_2(unknown)           = AliasedDefinition      : 
-#    3|     mu3_3(unknown)           = InitializeNonLocal     : 
-#    3|     r3_4(glval<int>)         = VariableAddress[x]     : 
-#    3|     mu3_5(int)               = InitializeParameter[x] : &:r3_4
-#    4|     r4_1(glval<type_info &>) = VariableAddress[t1]    : 
-#    4|     r4_2(glval<int>)         = VariableAddress[x]     : 
-#    4|     r4_3(glval<type_info>)   = TypeidExpr             : r4_2
-#    4|     r4_4(type_info &)        = CopyValue              : r4_3
-#    4|     mu4_5(type_info &)       = Store[t1]              : &:r4_1, r4_4
-#    5|     r5_1(glval<type_info &>) = VariableAddress[t2]    : 
-#    5|     r5_2(glval<type_info>)   = TypeidType             : 
-#    5|     r5_3(type_info &)        = CopyValue              : r5_2
-#    5|     mu5_4(type_info &)       = Store[t2]              : &:r5_1, r5_3
-#    6|     v6_1(void)               = NoOp                   : 
-#    3|     v3_6(void)               = ReturnVoid             : 
-#    3|     v3_7(void)               = AliasedUse             : ~m?
-#    3|     v3_8(void)               = ExitFunction           : 
--- a/cpp/ql/test/library-tests/ir/ir/type_info_test.cpp
+++ b/cpp/ql/test/library-tests/ir/ir/type_info_test.cpp
@@ -1,8 +0,0 @@
-#include <typeinfo>
-
-void type_info_test(int x) {
-  const std::type_info &t1 = typeid(x);
-  const std::type_info &t2 = typeid(int);
-}
-
-// semmle-extractor-options: -I.
--- a/cpp/ql/test/library-tests/ir/ir/typeinfo
+++ b/cpp/ql/test/library-tests/ir/ir/typeinfo
@@ -1,5 +0,0 @@
-#pragma once
-
-namespace std{
-    class type_info {};
-}
--- a/cpp/ql/test/query-tests/Critical/InitialisationNotRun/InitialisationNotRun.expected
+++ b/cpp/ql/test/query-tests/Critical/InitialisationNotRun/InitialisationNotRun.expected
@@ -1,2 +0,0 @@
-| test.cpp:12:16:12:17 | g1 | Initialization code for 'g1' is never run. |
-| test.cpp:14:23:14:24 | g3 | Initialization code for 'g3' is never run. |
--- a/cpp/ql/test/query-tests/Critical/InitialisationNotRun/InitialisationNotRun.qlref
+++ b/cpp/ql/test/query-tests/Critical/InitialisationNotRun/InitialisationNotRun.qlref
@@ -1 +0,0 @@
-Critical/InitialisationNotRun.ql
--- a/cpp/ql/test/query-tests/Critical/InitialisationNotRun/test.cpp
+++ b/cpp/ql/test/query-tests/Critical/InitialisationNotRun/test.cpp
@@ -1,36 +0,0 @@
-// --- stubs ---
-
-char *strcpy(char *dest, const char *src);
-
-// --- tests ---
-
-class GlobalStorage {
-public:
-    char name[1000];
-};
-
-GlobalStorage *g1; // BAD
-static GlobalStorage g2; // GOOD
-static GlobalStorage *g3; // BAD
-// static variables are initialized by compilers
-static int a;  // GOOD
-static int b = 0;  // GOOD
-
-void init() { //initializes g_storage, but is never run from main
-  g1 = new GlobalStorage();
-  g3 = new GlobalStorage();
-}
-
-void init2(int b) {
-  for (int i = 0; i < b; ++i)
-    a *= -1;
-}
-
-int main(int argc, char *argv[]) {
-	//init not called
-  strcpy(g1->name, argv[1]); // g1 is used before init() is called
-  strcpy(g2.name, argv[1]); // g2 is initialised by compiler
-  strcpy(g3->name, argv[1]);
-  b++;
-  return 0;
-}
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-119/SAMATE/OverrunWriteProductFlow.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-119/SAMATE/OverrunWriteProductFlow.expected
@@ -12,6 +12,19 @@ edges
 | test.cpp:42:13:42:15 | *str [string] | test.cpp:42:18:42:23 | string | provenance |  |
 | test.cpp:72:17:72:19 | *str [string] | test.cpp:72:22:72:27 | string | provenance |  |
 | test.cpp:80:17:80:19 | *str [string] | test.cpp:80:22:80:27 | string | provenance |  |
+| test.cpp:88:11:88:30 | **mk_string_t_plus_one [string] | test.cpp:96:21:96:40 | *call to mk_string_t_plus_one [string] | provenance |  |
+| test.cpp:90:5:90:7 | *str [post update] [string] | test.cpp:91:5:91:7 | *str [string] | provenance |  |
+| test.cpp:90:5:90:34 | ... = ... | test.cpp:90:5:90:7 | *str [post update] [string] | provenance |  |
+| test.cpp:90:19:90:24 | call to malloc | test.cpp:90:5:90:34 | ... = ... | provenance |  |
+| test.cpp:91:5:91:7 | *str [string] | test.cpp:92:12:92:14 | *str [string] | provenance |  |
+| test.cpp:92:12:92:14 | *str [string] | test.cpp:88:11:88:30 | **mk_string_t_plus_one [string] | provenance |  |
+| test.cpp:96:21:96:40 | *call to mk_string_t_plus_one [string] | test.cpp:96:21:96:40 | *call to mk_string_t_plus_one [string] | provenance |  |
+| test.cpp:96:21:96:40 | *call to mk_string_t_plus_one [string] | test.cpp:99:13:99:15 | *str [string] | provenance |  |
+| test.cpp:96:21:96:40 | *call to mk_string_t_plus_one [string] | test.cpp:129:17:129:19 | *str [string] | provenance |  |
+| test.cpp:96:21:96:40 | *call to mk_string_t_plus_one [string] | test.cpp:137:17:137:19 | *str [string] | provenance |  |
+| test.cpp:99:13:99:15 | *str [string] | test.cpp:99:18:99:23 | string | provenance |  |
+| test.cpp:129:17:129:19 | *str [string] | test.cpp:129:22:129:27 | string | provenance |  |
+| test.cpp:137:17:137:19 | *str [string] | test.cpp:137:22:137:27 | string | provenance |  |
 | test.cpp:147:5:147:7 | *str [post update] [string] | test.cpp:148:5:148:7 | *str [string] | provenance |  |
 | test.cpp:147:5:147:34 | ... = ... | test.cpp:147:5:147:7 | *str [post update] [string] | provenance |  |
 | test.cpp:147:19:147:24 | call to malloc | test.cpp:147:5:147:34 | ... = ... | provenance |  |
@@ -33,6 +46,12 @@ edges
 | test.cpp:199:17:199:19 | *str [string] | test.cpp:199:22:199:27 | string | provenance |  |
 | test.cpp:203:17:203:19 | *str [string] | test.cpp:203:22:203:27 | string | provenance |  |
 | test.cpp:207:17:207:19 | *str [string] | test.cpp:207:22:207:27 | string | provenance |  |
+| test.cpp:214:24:214:24 | p | test.cpp:216:10:216:10 | p | provenance |  |
+| test.cpp:220:27:220:54 | call to malloc | test.cpp:220:27:220:54 | call to malloc | provenance |  |
+| test.cpp:220:27:220:54 | call to malloc | test.cpp:222:15:222:20 | buffer | provenance |  |
+| test.cpp:222:15:222:20 | buffer | test.cpp:214:24:214:24 | p | provenance |  |
+| test.cpp:228:27:228:54 | call to malloc | test.cpp:228:27:228:54 | call to malloc | provenance |  |
+| test.cpp:228:27:228:54 | call to malloc | test.cpp:232:10:232:15 | buffer | provenance |  |
 | test.cpp:235:40:235:45 | buffer | test.cpp:236:5:236:26 | ... = ... | provenance |  |
 | test.cpp:236:5:236:9 | *p_str [post update] [string] | test.cpp:235:27:235:31 | *p_str [Return] [string] | provenance |  |
 | test.cpp:236:5:236:9 | *p_str [post update] [string] | test.cpp:235:27:235:31 | *p_str [string] | provenance |  |
@@ -45,6 +64,8 @@ edges
 | test.cpp:243:12:243:14 | *str [string] | test.cpp:243:12:243:21 | string | provenance |  |
 | test.cpp:249:14:249:33 | call to my_alloc | test.cpp:249:14:249:33 | call to my_alloc | provenance |  |
 | test.cpp:249:14:249:33 | call to my_alloc | test.cpp:250:12:250:12 | p | provenance |  |
+| test.cpp:256:5:256:25 | ... = ... | test.cpp:257:12:257:12 | p | provenance |  |
+| test.cpp:256:9:256:25 | call to malloc | test.cpp:256:5:256:25 | ... = ... | provenance |  |
 | test.cpp:262:15:262:30 | call to malloc | test.cpp:262:15:262:30 | call to malloc | provenance |  |
 | test.cpp:262:15:262:30 | call to malloc | test.cpp:266:12:266:12 | p | provenance |  |
 | test.cpp:264:9:264:30 | ... = ... | test.cpp:266:12:266:12 | p | provenance |  |
@@ -64,6 +85,20 @@ nodes
 | test.cpp:72:22:72:27 | string | semmle.label | string |
 | test.cpp:80:17:80:19 | *str [string] | semmle.label | *str [string] |
 | test.cpp:80:22:80:27 | string | semmle.label | string |
+| test.cpp:88:11:88:30 | **mk_string_t_plus_one [string] | semmle.label | **mk_string_t_plus_one [string] |
+| test.cpp:90:5:90:7 | *str [post update] [string] | semmle.label | *str [post update] [string] |
+| test.cpp:90:5:90:34 | ... = ... | semmle.label | ... = ... |
+| test.cpp:90:19:90:24 | call to malloc | semmle.label | call to malloc |
+| test.cpp:91:5:91:7 | *str [string] | semmle.label | *str [string] |
+| test.cpp:92:12:92:14 | *str [string] | semmle.label | *str [string] |
+| test.cpp:96:21:96:40 | *call to mk_string_t_plus_one [string] | semmle.label | *call to mk_string_t_plus_one [string] |
+| test.cpp:96:21:96:40 | *call to mk_string_t_plus_one [string] | semmle.label | *call to mk_string_t_plus_one [string] |
+| test.cpp:99:13:99:15 | *str [string] | semmle.label | *str [string] |
+| test.cpp:99:18:99:23 | string | semmle.label | string |
+| test.cpp:129:17:129:19 | *str [string] | semmle.label | *str [string] |
+| test.cpp:129:22:129:27 | string | semmle.label | string |
+| test.cpp:137:17:137:19 | *str [string] | semmle.label | *str [string] |
+| test.cpp:137:22:137:27 | string | semmle.label | string |
 | test.cpp:147:5:147:7 | *str [post update] [string] | semmle.label | *str [post update] [string] |
 | test.cpp:147:5:147:34 | ... = ... | semmle.label | ... = ... |
 | test.cpp:147:19:147:24 | call to malloc | semmle.label | call to malloc |
@@ -86,6 +121,14 @@ nodes
 | test.cpp:203:22:203:27 | string | semmle.label | string |
 | test.cpp:207:17:207:19 | *str [string] | semmle.label | *str [string] |
 | test.cpp:207:22:207:27 | string | semmle.label | string |
+| test.cpp:214:24:214:24 | p | semmle.label | p |
+| test.cpp:216:10:216:10 | p | semmle.label | p |
+| test.cpp:220:27:220:54 | call to malloc | semmle.label | call to malloc |
+| test.cpp:220:27:220:54 | call to malloc | semmle.label | call to malloc |
+| test.cpp:222:15:222:20 | buffer | semmle.label | buffer |
+| test.cpp:228:27:228:54 | call to malloc | semmle.label | call to malloc |
+| test.cpp:228:27:228:54 | call to malloc | semmle.label | call to malloc |
+| test.cpp:232:10:232:15 | buffer | semmle.label | buffer |
 | test.cpp:235:27:235:31 | *p_str [Return] [string] | semmle.label | *p_str [Return] [string] |
 | test.cpp:235:27:235:31 | *p_str [string] | semmle.label | *p_str [string] |
 | test.cpp:235:40:235:45 | buffer | semmle.label | buffer |
@@ -100,6 +143,9 @@ nodes
 | test.cpp:249:14:249:33 | call to my_alloc | semmle.label | call to my_alloc |
 | test.cpp:249:14:249:33 | call to my_alloc | semmle.label | call to my_alloc |
 | test.cpp:250:12:250:12 | p | semmle.label | p |
+| test.cpp:256:5:256:25 | ... = ... | semmle.label | ... = ... |
+| test.cpp:256:9:256:25 | call to malloc | semmle.label | call to malloc |
+| test.cpp:257:12:257:12 | p | semmle.label | p |
 | test.cpp:262:15:262:30 | call to malloc | semmle.label | call to malloc |
 | test.cpp:262:15:262:30 | call to malloc | semmle.label | call to malloc |
 | test.cpp:264:9:264:30 | ... = ... | semmle.label | ... = ... |
@@ -112,6 +158,9 @@ subpaths
 | test.cpp:42:5:42:11 | call to strncpy | test.cpp:18:19:18:24 | call to malloc | test.cpp:42:18:42:23 | string | This write may overflow $@ by 1 element. | test.cpp:42:18:42:23 | string | string |
 | test.cpp:72:9:72:15 | call to strncpy | test.cpp:18:19:18:24 | call to malloc | test.cpp:72:22:72:27 | string | This write may overflow $@ by 1 element. | test.cpp:72:22:72:27 | string | string |
 | test.cpp:80:9:80:15 | call to strncpy | test.cpp:18:19:18:24 | call to malloc | test.cpp:80:22:80:27 | string | This write may overflow $@ by 2 elements. | test.cpp:80:22:80:27 | string | string |
+| test.cpp:99:5:99:11 | call to strncpy | test.cpp:90:19:90:24 | call to malloc | test.cpp:99:18:99:23 | string | This write may overflow $@ by 1 element. | test.cpp:99:18:99:23 | string | string |
+| test.cpp:129:9:129:15 | call to strncpy | test.cpp:90:19:90:24 | call to malloc | test.cpp:129:22:129:27 | string | This write may overflow $@ by 1 element. | test.cpp:129:22:129:27 | string | string |
+| test.cpp:137:9:137:15 | call to strncpy | test.cpp:90:19:90:24 | call to malloc | test.cpp:137:22:137:27 | string | This write may overflow $@ by 2 elements. | test.cpp:137:22:137:27 | string | string |
 | test.cpp:152:5:152:11 | call to strncpy | test.cpp:147:19:147:24 | call to malloc | test.cpp:152:18:152:23 | string | This write may overflow $@ by 1 element. | test.cpp:152:18:152:23 | string | string |
 | test.cpp:154:5:154:11 | call to strncpy | test.cpp:147:19:147:24 | call to malloc | test.cpp:154:18:154:23 | string | This write may overflow $@ by 1 element. | test.cpp:154:18:154:23 | string | string |
 | test.cpp:156:5:156:11 | call to strncpy | test.cpp:147:19:147:24 | call to malloc | test.cpp:156:18:156:23 | string | This write may overflow $@ by 2 elements. | test.cpp:156:18:156:23 | string | string |
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-119/SAMATE/test.cpp
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-119/SAMATE/test.cpp
@@ -264,15 +264,4 @@ void test7(unsigned n) {
        p = (char*)malloc(++n);
    }
    memset(p, 0, n); // GOOD [FALSE POSITIVE]
-}
-
-void test8(unsigned size, unsigned src_pos)
-{
-  char *xs = new char[size];
-  if (src_pos > size) {
-    src_pos = size;
-  }
-  if (src_pos < size - 1) {
-    memset(xs, 0, src_pos + 1); // GOOD
-  }
 }
--- a/Show More
+++ b/Show More